From 2720e94a9685dda624637965b02d2d329048a821 Mon Sep 17 00:00:00 2001 From: hermanventer Date: Fri, 12 Jul 2024 11:47:15 -0700 Subject: [PATCH 1/2] Update dependencies --- Cargo.lock | 4 ++-- binaries/summary_store.tar | Bin 3000832 -> 3000320 bytes checker/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74c72e9c..5bd42e58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1038,9 +1038,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.9" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" dependencies = [ "serde", "stable_deref_trait", diff --git a/binaries/summary_store.tar b/binaries/summary_store.tar index 907c0a13316ebe8aa4a1469c53837c75d6064d37..9629a3c7356af5b9397ec3d5aabdebf092e68000 100644 GIT binary patch delta 5157 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 delta 5205 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 diff --git a/checker/Cargo.toml b/checker/Cargo.toml index c833070e..0858eccf 100644 --- a/checker/Cargo.toml +++ b/checker/Cargo.toml @@ -49,7 +49,7 @@ shellwords = "*" sled = "*" tar = "*" tempfile = "*" -triomphe = "=0.1.9" +triomphe = "*" z3-sys = { version = "*", git = "https://github.com/prove-rs/z3.rs.git", optional = true } [dev-dependencies] From b5a8d4eed2f4f1341b49ad000cb1233c5cad42e5 Mon Sep 17 00:00:00 2001 From: hermanventer Date: Fri, 12 Jul 2024 12:17:16 -0700 Subject: [PATCH 2/2] 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)]