From b5a8d4eed2f4f1341b49ad000cb1233c5cad42e5 Mon Sep 17 00:00:00 2001 From: hermanventer Date: Fri, 12 Jul 2024 12:17:16 -0700 Subject: [PATCH] nightly-2023-12-07 --- Cargo.lock | 11 ----------- binaries/summary_store.tar | Bin 3000320 -> 3000320 bytes checker/Cargo.toml | 1 - checker/src/lib.rs | 1 + checker/src/utils.rs | 10 ++++++---- checker/tests/call_graph/fnptr.rs | 2 +- checker/tests/call_graph/fnptr_clean.rs | 2 +- checker/tests/call_graph/fnptr_deduplicate.rs | 2 +- checker/tests/call_graph/fnptr_dom.rs | 2 +- checker/tests/call_graph/fnptr_dom_loop.rs | 2 +- .../call_graph/fnptr_dom_loop_souffle.rs | 2 +- checker/tests/call_graph/fnptr_fold.rs | 18 +++++++++--------- checker/tests/call_graph/fnptr_loop.rs | 2 +- checker/tests/call_graph/fnptr_slice.rs | 2 +- checker/tests/call_graph/generic.rs | 2 +- .../tests/call_graph/static_deduplicate.rs | 6 +++--- checker/tests/call_graph/static_fold.rs | 16 ++++++++-------- checker/tests/call_graph/trait.rs | 2 +- checker/tests/run-pass/alloc_zeroed.rs | 1 + checker/tests/run-pass/copy_from_slice.rs | 1 + checker/tests/run-pass/deallocate.rs | 1 + checker/tests/run-pass/discriminant.rs | 1 + checker/tests/run-pass/maybe_unreachable.rs | 1 + checker/tests/run-pass/offset.rs | 1 + checker/tests/run-pass/read_to_end.rs | 7 ++----- checker/tests/run-pass/slice_copy.rs | 1 + checker/tests/run-pass/transmute.rs | 1 + checker/tests/run-pass/unreachable.rs | 1 + rust-toolchain.toml | 2 +- standard_contracts/src/lib.rs | 1 + 30 files changed, 50 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5bd42e58..99bc37a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -588,7 +588,6 @@ dependencies = [ "sled", "tar", "tempfile", - "triomphe", "walkdir", "z3-sys", ] @@ -918,12 +917,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -1041,10 +1034,6 @@ name = "triomphe" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" -dependencies = [ - "serde", - "stable_deref_trait", -] [[package]] name = "unicode-ident" diff --git a/binaries/summary_store.tar b/binaries/summary_store.tar index 9629a3c7356af5b9397ec3d5aabdebf092e68000..b36ea95a24a219fcc5e3e8bc77ef7afbff067052 100644 GIT binary patch delta 323 zcmY+MUlFVe;*~-cXgT#Uc6R3O)Lo7BSvG6@KKFatv zBnUV8HTUEcXSzsbip5JM(ngQ1(#G1zW>mZkpO!j&7n#d{mLyTKljZg@W8;j{o8Gf{ zGw}pj?v4ClDOC0b~sgR58ZlncJUK32~C rIBxRxI17A*5ZAcDExPETj{)v*k0Bn?z#mQ4JNsi}wi{FV96A3Nt`SL& delta 323 zcmYk%OHKko6op~0*o`Q(peTYM-8_7EQbJeNfT6o_6A&0M(S#nk12@2+6K1T0rIbG* zDmVEi_v8%DWRb}Pi_h}FCMGeVdNoGtgHWf@TdJa^$cOxA)@rkt<$g0u&khtlwd>8q zn~NtnL=H#T{(R(di~>$@iXut~aE3A}IL8I5xWpA|xJDff+@OgTZqfb{FLXhF`aW`Q r) -> bool { .opt_def_id() .map_or_else( || { - tcx.sess - .delay_span_bug(tr.path.span, "trait without a def-id"); + tcx.sess.span_delayed_bug( + tr.path.span, + "trait without a def-id", + ); ty::Visibility::Public }, |def_id| tcx.visibility(def_id), @@ -425,10 +427,10 @@ fn push_component_name(component_data: DefPathData, target: &mut String) { ForeignMod => "foreign", Use => "use", GlobalAsm => "global_asm", - ClosureExpr => "closure", + Closure => "closure", Ctor => "ctor", AnonConst => "constant", - ImplTrait => "implement_trait", + OpaqueTy => "opaque", _ => assume_unreachable!(), }), }; diff --git a/checker/tests/call_graph/fnptr.rs b/checker/tests/call_graph/fnptr.rs index 1889e3ab..2b4778ef 100644 --- a/checker/tests/call_graph/fnptr.rs +++ b/checker/tests/call_graph/fnptr.rs @@ -69,7 +69,7 @@ commit; ], "callables": [ { - "name": "/fnptr/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr[cc2d]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr[26f3]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 9, "local": true diff --git a/checker/tests/call_graph/fnptr_clean.rs b/checker/tests/call_graph/fnptr_clean.rs index 44e68c29..7c572298 100644 --- a/checker/tests/call_graph/fnptr_clean.rs +++ b/checker/tests/call_graph/fnptr_clean.rs @@ -74,7 +74,7 @@ commit; ], "callables": [ { - "name": "/fnptr_clean/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_clean[561d]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_clean/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_clean[599c]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 14, "local": true diff --git a/checker/tests/call_graph/fnptr_deduplicate.rs b/checker/tests/call_graph/fnptr_deduplicate.rs index 2a78000d..fe52121c 100644 --- a/checker/tests/call_graph/fnptr_deduplicate.rs +++ b/checker/tests/call_graph/fnptr_deduplicate.rs @@ -66,7 +66,7 @@ commit; ], "callables": [ { - "name": "/fnptr_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_deduplicate[adf7]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_deduplicate[2d10]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 10, "local": true diff --git a/checker/tests/call_graph/fnptr_dom.rs b/checker/tests/call_graph/fnptr_dom.rs index 70fe48fe..eecd2a8e 100644 --- a/checker/tests/call_graph/fnptr_dom.rs +++ b/checker/tests/call_graph/fnptr_dom.rs @@ -71,7 +71,7 @@ commit; ], "callables": [ { - "name": "/fnptr_dom/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_dom[aaca]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:8 ~ fnptr_dom[aaca]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_dom/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_dom[7782]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:8 ~ fnptr_dom[7782]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 9, "local": true diff --git a/checker/tests/call_graph/fnptr_dom_loop.rs b/checker/tests/call_graph/fnptr_dom_loop.rs index 6db971ff..b4ceb952 100644 --- a/checker/tests/call_graph/fnptr_dom_loop.rs +++ b/checker/tests/call_graph/fnptr_dom_loop.rs @@ -85,7 +85,7 @@ commit; ], "callables": [ { - "name": "/fnptr_dom_loop/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop[2dba]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop[2dba]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_dom_loop/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop[cf26]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop[cf26]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 9, "local": true diff --git a/checker/tests/call_graph/fnptr_dom_loop_souffle.rs b/checker/tests/call_graph/fnptr_dom_loop_souffle.rs index e2b68f32..bba9bd3e 100644 --- a/checker/tests/call_graph/fnptr_dom_loop_souffle.rs +++ b/checker/tests/call_graph/fnptr_dom_loop_souffle.rs @@ -82,7 +82,7 @@ digraph { ], "callables": [ { - "name": "/fnptr_dom_loop_souffle/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop_souffle[f3f8]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop_souffle[f3f8]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_dom_loop_souffle/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop_souffle[ce91]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop_souffle[ce91]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 10, "local": true diff --git a/checker/tests/call_graph/fnptr_fold.rs b/checker/tests/call_graph/fnptr_fold.rs index 046f863d..1b0f2623 100644 --- a/checker/tests/call_graph/fnptr_fold.rs +++ b/checker/tests/call_graph/fnptr_fold.rs @@ -68,14 +68,14 @@ commit; /* EXPECTED:CALL_SITES{ "files": [ "tests/call_graph/fnptr_fold.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/std/src/io/stdio.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/core/src/fmt/mod.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/core/src/slice/mod.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/core/src/ptr/metadata.rs" + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/std/src/io/stdio.rs", + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/core/src/fmt/mod.rs", + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/core/src/slice/mod.rs", + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/core/src/ptr/metadata.rs" ], "callables": [ { - "name": "/fnptr_fold/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_fold[6cb6]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_fold/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_fold[8908]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 10, "local": true @@ -99,25 +99,25 @@ commit; "local": true }, { - "name": "/std/std::io::_print(std::fmt::Arguments)->()", + "name": "/std/std::io::_print(std::fmt::Arguments)->()", "file_index": 1, "first_line": 1096, "local": false }, { - "name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9648 ~ core[499d]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", + "name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9827 ~ core[408d]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", "file_index": 2, "first_line": 321, "local": true }, { - "name": "/core/core::slice::::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:58514 ~ core[499d]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", + "name": "/core/core::slice::::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:59746 ~ core[408d]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", "file_index": 3, "first_line": 142, "local": true }, { - "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1750 ~ core[499d]::ptr::metadata::Pointee::Metadata) })", + "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1750 ~ core[408d]::ptr::metadata::Pointee::Metadata) })", "file_index": 4, "first_line": 94, "local": true diff --git a/checker/tests/call_graph/fnptr_loop.rs b/checker/tests/call_graph/fnptr_loop.rs index e3e5144e..2513dd01 100644 --- a/checker/tests/call_graph/fnptr_loop.rs +++ b/checker/tests/call_graph/fnptr_loop.rs @@ -82,7 +82,7 @@ commit; "local": true }, { - "name": "/fnptr_loop/fn2(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_loop[11d0]::fn2::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_loop/fn2(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_loop[4126]::fn2::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 12, "local": true diff --git a/checker/tests/call_graph/fnptr_slice.rs b/checker/tests/call_graph/fnptr_slice.rs index 5dea239a..dfd9661a 100644 --- a/checker/tests/call_graph/fnptr_slice.rs +++ b/checker/tests/call_graph/fnptr_slice.rs @@ -62,7 +62,7 @@ commit; ], "callables": [ { - "name": "/fnptr_slice/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_slice[5571]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_slice/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_slice[df6f]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", "file_index": 0, "first_line": 10, "local": true diff --git a/checker/tests/call_graph/generic.rs b/checker/tests/call_graph/generic.rs index 5506b431..44a62a64 100644 --- a/checker/tests/call_graph/generic.rs +++ b/checker/tests/call_graph/generic.rs @@ -74,7 +74,7 @@ commit; "local": true }, { - "name": "/generic/Gen::::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:12 ~ generic[627e]::{impl#0}::bar::'_), '_) }) Gen,T/#0)->()", + "name": "/generic/Gen::::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:12 ~ generic[60ea]::{impl#0}::bar::'_), '_) }) Gen,T/#0)->()", "file_index": 0, "first_line": 14, "local": true diff --git a/checker/tests/call_graph/static_deduplicate.rs b/checker/tests/call_graph/static_deduplicate.rs index 83caa962..aaff64c4 100644 --- a/checker/tests/call_graph/static_deduplicate.rs +++ b/checker/tests/call_graph/static_deduplicate.rs @@ -66,19 +66,19 @@ commit; ], "callables": [ { - "name": "/static_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[34e1]::fn1::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[34e1]::fn1::'_), '_) }) str)", + "name": "/static_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[c483]::fn1::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[c483]::fn1::'_), '_) }) str)", "file_index": 0, "first_line": 10, "local": true }, { - "name": "/static_deduplicate/fn2(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[34e1]::fn2::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[34e1]::fn2::'_), '_) }) str)", + "name": "/static_deduplicate/fn2(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[c483]::fn2::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[c483]::fn2::'_), '_) }) str)", "file_index": 0, "first_line": 13, "local": true }, { - "name": "/static_deduplicate/fn3(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[34e1]::fn3::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[34e1]::fn3::'_), '_) }) str)", + "name": "/static_deduplicate/fn3(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[c483]::fn3::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[c483]::fn3::'_), '_) }) str)", "file_index": 0, "first_line": 16, "local": true diff --git a/checker/tests/call_graph/static_fold.rs b/checker/tests/call_graph/static_fold.rs index b92b3fe2..3a212d6f 100644 --- a/checker/tests/call_graph/static_fold.rs +++ b/checker/tests/call_graph/static_fold.rs @@ -64,10 +64,10 @@ commit; /* EXPECTED:CALL_SITES{ "files": [ "tests/call_graph/static_fold.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/std/src/io/stdio.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/core/src/fmt/mod.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/core/src/slice/mod.rs", - "/rustc/49b3924bd4a34d3cf9c37b74120fba78d9712ab8/library/core/src/ptr/metadata.rs" + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/std/src/io/stdio.rs", + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/core/src/fmt/mod.rs", + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/core/src/slice/mod.rs", + "/rustc/1fdfe1234795a289af1088aefa92ef80191cb611/library/core/src/ptr/metadata.rs" ], "callables": [ { @@ -95,25 +95,25 @@ commit; "local": true }, { - "name": "/std/std::io::_print(std::fmt::Arguments)->()", + "name": "/std/std::io::_print(std::fmt::Arguments)->()", "file_index": 1, "first_line": 1096, "local": false }, { - "name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9648 ~ core[499d]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", + "name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9827 ~ core[408d]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", "file_index": 2, "first_line": 321, "local": false }, { - "name": "/core/core::slice::::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:58514 ~ core[499d]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", + "name": "/core/core::slice::::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:59746 ~ core[408d]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", "file_index": 3, "first_line": 142, "local": true }, { - "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1750 ~ core[499d]::ptr::metadata::Pointee::Metadata) })", + "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1750 ~ core[408d]::ptr::metadata::Pointee::Metadata) })", "file_index": 4, "first_line": 94, "local": true diff --git a/checker/tests/call_graph/trait.rs b/checker/tests/call_graph/trait.rs index 3fce1262..4e3f255d 100644 --- a/checker/tests/call_graph/trait.rs +++ b/checker/tests/call_graph/trait.rs @@ -73,7 +73,7 @@ commit; "local": true }, { - "name": "/trait/::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:13 ~ trait[e2b9]::{impl#0}::bar::'_), '_) }) Bar)->i32", + "name": "/trait/::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:13 ~ trait[6f4c]::{impl#0}::bar::'_), '_) }) Bar)->i32", "file_index": 0, "first_line": 14, "local": true diff --git a/checker/tests/run-pass/alloc_zeroed.rs b/checker/tests/run-pass/alloc_zeroed.rs index 76759ecd..3f47d7db 100644 --- a/checker/tests/run-pass/alloc_zeroed.rs +++ b/checker/tests/run-pass/alloc_zeroed.rs @@ -6,6 +6,7 @@ // A test that checks that dereferenced uninitialized pointers into zeroed heap blocks known to be zero. +#![allow(internal_features)] #![feature(core_intrinsics)] use mirai_annotations::*; diff --git a/checker/tests/run-pass/copy_from_slice.rs b/checker/tests/run-pass/copy_from_slice.rs index bb1853fb..5d4e8b4f 100644 --- a/checker/tests/run-pass/copy_from_slice.rs +++ b/checker/tests/run-pass/copy_from_slice.rs @@ -3,6 +3,7 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the root directory of this source tree. +#![allow(internal_features)] #![feature(core_intrinsics)] use mirai_annotations::*; diff --git a/checker/tests/run-pass/deallocate.rs b/checker/tests/run-pass/deallocate.rs index ce6ca29b..d9f7c9a2 100644 --- a/checker/tests/run-pass/deallocate.rs +++ b/checker/tests/run-pass/deallocate.rs @@ -7,6 +7,7 @@ // A test that checks that deallocations are valid and that further uses of deallocated // pointers will lead to verification errors. +#![allow(internal_features)] #![feature(core_intrinsics)] use mirai_annotations::*; diff --git a/checker/tests/run-pass/discriminant.rs b/checker/tests/run-pass/discriminant.rs index e98a526c..56c6b5a4 100644 --- a/checker/tests/run-pass/discriminant.rs +++ b/checker/tests/run-pass/discriminant.rs @@ -6,6 +6,7 @@ // A test that checks that std::intrinsics::discriminant_value is properly implemented. +#![allow(internal_features)] #![feature(core_intrinsics)] use mirai_annotations::*; diff --git a/checker/tests/run-pass/maybe_unreachable.rs b/checker/tests/run-pass/maybe_unreachable.rs index f6ce455f..eb40b953 100644 --- a/checker/tests/run-pass/maybe_unreachable.rs +++ b/checker/tests/run-pass/maybe_unreachable.rs @@ -6,6 +6,7 @@ // A test that calls std::intrinsics::unreachable conditionally. +#![allow(internal_features)] #![feature(core_intrinsics)] #![allow(unused)] diff --git a/checker/tests/run-pass/offset.rs b/checker/tests/run-pass/offset.rs index 2f171e1b..253f5d33 100644 --- a/checker/tests/run-pass/offset.rs +++ b/checker/tests/run-pass/offset.rs @@ -5,6 +5,7 @@ // // A test that creates and checks pointer offsets +#![allow(internal_features)] #![feature(core_intrinsics)] use mirai_annotations::*; diff --git a/checker/tests/run-pass/read_to_end.rs b/checker/tests/run-pass/read_to_end.rs index 6a233ea9..590a1c46 100644 --- a/checker/tests/run-pass/read_to_end.rs +++ b/checker/tests/run-pass/read_to_end.rs @@ -13,12 +13,9 @@ use std::io::{Cursor, Read, Result}; pub fn t1(buf: &[u8]) -> Result<()> { let mut reader = Cursor::new(buf); let mut v = Vec::with_capacity(1); + reader.read_to_end(&mut v)?; // todo: fix this - reader.read_to_end(&mut v)?; //~ slice index starts at after slice end - //~ related location - //~ related location - // todo: fix this - //verify!(v.len() == 0); // ~ possible false verification condition + //verify!(v.len() == 0); // ~ possible false verification condition Ok(()) } diff --git a/checker/tests/run-pass/slice_copy.rs b/checker/tests/run-pass/slice_copy.rs index a78c3d88..81e93639 100644 --- a/checker/tests/run-pass/slice_copy.rs +++ b/checker/tests/run-pass/slice_copy.rs @@ -6,6 +6,7 @@ // A test that invokes std::intrinsics::copy_nonoverlapping; +#![allow(internal_features)] #![feature(core_intrinsics)] use mirai_annotations::*; diff --git a/checker/tests/run-pass/transmute.rs b/checker/tests/run-pass/transmute.rs index 72fb9ebf..77b78d86 100644 --- a/checker/tests/run-pass/transmute.rs +++ b/checker/tests/run-pass/transmute.rs @@ -6,6 +6,7 @@ // A test that uses std::mem::transmute +#![allow(internal_features)] #![feature(core_intrinsics)] use mirai_annotations::*; diff --git a/checker/tests/run-pass/unreachable.rs b/checker/tests/run-pass/unreachable.rs index 5d32bb68..37d313cd 100644 --- a/checker/tests/run-pass/unreachable.rs +++ b/checker/tests/run-pass/unreachable.rs @@ -6,6 +6,7 @@ // A test that calls std::intrinsics::unreachable unconditionally. +#![allow(internal_features)] #![feature(core_intrinsics)] #![allow(unused)] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6c5f8742..3e104c55 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-11-28" +channel = "nightly-2023-12-07" components = ["clippy", "rustfmt", "rustc-dev", "rust-src", "rust-std", "llvm-tools-preview"] diff --git a/standard_contracts/src/lib.rs b/standard_contracts/src/lib.rs index f3f644ed..ebce0236 100644 --- a/standard_contracts/src/lib.rs +++ b/standard_contracts/src/lib.rs @@ -4,6 +4,7 @@ // LICENSE file in the root directory of this source tree. // +#![allow(internal_features)] #![feature(allocator_api)] #![feature(core_intrinsics)] #![feature(discriminant_kind)]