From 77fcfd8435b2d9bccebec2317a51449544d7a380 Mon Sep 17 00:00:00 2001 From: Herman Venter Date: Fri, 12 Jul 2024 11:03:44 -0700 Subject: [PATCH] nightly-2023-10-29 (#1267) --- Cargo.lock | 22 +++++++++--------- binaries/summary_store.tar | Bin 3000832 -> 3008512 bytes checker/src/utils.rs | 7 +++--- 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 +- rust-toolchain.toml | 2 +- 17 files changed, 46 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 234ba2cf..74c72e9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -102,7 +102,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -157,9 +157,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" +checksum = "907d8581360765417f8f2e0e7d602733bbed60156b4465b7617243689ef9b83d" [[package]] name = "cexpr" @@ -858,7 +858,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -955,9 +955,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -1003,22 +1003,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] diff --git a/binaries/summary_store.tar b/binaries/summary_store.tar index 7ce37759a3d064ebbcc0cd7a267473a3e299ce40..1ad6fb7e700a373bb1d1c1d101ef628eec1f027c 100644 GIT binary patch delta 6863 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 SU7d#nJ^$;1%8&YYS^YP4RspL3 delta 5222 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 M7eA@L9a!!7zg@OT_W%F@ diff --git a/checker/src/utils.rs b/checker/src/utils.rs index 0887f043..2363f4a3 100644 --- a/checker/src/utils.rs +++ b/checker/src/utils.rs @@ -471,9 +471,10 @@ pub fn def_id_display_name(tcx: TyCtxt<'_>, def_id: DefId) -> String { struct PrettyDefId<'tcx>(DefId, TyCtxt<'tcx>); impl std::fmt::Debug for PrettyDefId<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - let pr = FmtPrinter::new(self.1, rustc_hir::def::Namespace::ValueNS) - .print_def_path(self.0, &[])?; - f.write_str(&pr.into_buffer()) + let s = FmtPrinter::print_string(self.1, rustc_hir::def::Namespace::ValueNS, |cx| { + cx.print_def_path(self.0, &[]) + })?; + f.write_str(&s) } } format!("{:?}", PrettyDefId(def_id, tcx)) diff --git a/checker/tests/call_graph/fnptr.rs b/checker/tests/call_graph/fnptr.rs index 8a7fac0d..0859f82b 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr[ecc1]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr[72bf]::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 a05967ba..9632e04f 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_clean[0e2e]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_clean/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_clean[f297]::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 7ae9bd60..804ccfc7 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_deduplicate[6eae]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_deduplicate/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_deduplicate[0206]::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 42613ebe..03985e43 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_dom[4ce6]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:8 ~ fnptr_dom[4ce6]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_dom/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_dom[aa00]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:8 ~ fnptr_dom[aa00]::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 a9658d1b..5a5ee005 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop[fbb7]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop[fbb7]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_dom_loop/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop[0b96]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop[0b96]::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 360275be..2325f784 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop_souffle[ef00]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop_souffle[ef00]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_dom_loop_souffle/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_dom_loop_souffle[9ac1]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop_souffle[9ac1]::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 a84c538f..dd7e9f02 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/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/std/src/io/stdio.rs", - "/rustc/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/core/src/fmt/mod.rs", - "/rustc/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/core/src/slice/mod.rs", - "/rustc/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/core/src/ptr/metadata.rs" + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/library/std/src/io/stdio.rs", + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/library/core/src/fmt/mod.rs", + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/library/core/src/slice/mod.rs", + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/library/core/src/ptr/metadata.rs" ], "callables": [ { - "name": "/fnptr_fold/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_fold[2ef9]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_fold/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_fold[9539]::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(&ReEarlyBound(DefId(2:9542 ~ core[7ff5]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", + "name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyBound(DefId(2:9526 ~ core[93bd]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", "file_index": 2, "first_line": 318, "local": true }, { - "name": "/core/core::slice::::len(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:57302 ~ core[7ff5]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", + "name": "/core/core::slice::::len(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:57287 ~ core[93bd]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", "file_index": 3, "first_line": 141, "local": true }, { - "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1738 ~ core[7ff5]::ptr::metadata::Pointee::Metadata) })", + "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1738 ~ core[93bd]::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 f6eab550..067470ad 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_loop[e0ae]::fn2::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_loop/fn2(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_loop[2ae8]::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 045f0d9f..4c9146c5 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_slice[fe67]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32", + "name": "/fnptr_slice/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_slice[a891]::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 0fa881ea..8557e294 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(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:12 ~ generic[87ab]::{impl#0}::bar::'_), '_) }) Gen,T/#0)->()", + "name": "/generic/Gen::::bar(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:12 ~ generic[6eac]::{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 7096914b..5dac8038 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,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[9a58]::fn1::'_), '_) }) str)->(u32, &ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[9a58]::fn1::'_), '_) }) str)", + "name": "/static_deduplicate/fn1(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[b3a9]::fn1::'_), '_) }) str)->(u32, &ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[b3a9]::fn1::'_), '_) }) str)", "file_index": 0, "first_line": 10, "local": true }, { - "name": "/static_deduplicate/fn2(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[9a58]::fn2::'_), '_) }) str)->(u32, &ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[9a58]::fn2::'_), '_) }) str)", + "name": "/static_deduplicate/fn2(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[b3a9]::fn2::'_), '_) }) str)->(u32, &ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[b3a9]::fn2::'_), '_) }) str)", "file_index": 0, "first_line": 13, "local": true }, { - "name": "/static_deduplicate/fn3(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[9a58]::fn3::'_), '_) }) str)->(u32, &ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[9a58]::fn3::'_), '_) }) str)", + "name": "/static_deduplicate/fn3(u32,&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[b3a9]::fn3::'_), '_) }) str)->(u32, &ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[b3a9]::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 35fe9a2f..91e6f89d 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/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/std/src/io/stdio.rs", - "/rustc/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/core/src/fmt/mod.rs", - "/rustc/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/core/src/slice/mod.rs", - "/rustc/1c05d50c8403c56d9a8b6fb871f15aaa26fb5d07/library/core/src/ptr/metadata.rs" + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/library/std/src/io/stdio.rs", + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/library/core/src/fmt/mod.rs", + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/library/core/src/slice/mod.rs", + "/rustc/e5cfc55477eceed1317a02189fdf77a4a98f2124/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(&ReEarlyBound(DefId(2:9542 ~ core[7ff5]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", + "name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyBound(DefId(2:9526 ~ core[93bd]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments", "file_index": 2, "first_line": 318, "local": false }, { - "name": "/core/core::slice::::len(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:57302 ~ core[7ff5]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", + "name": "/core/core::slice::::len(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:57287 ~ core[93bd]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize", "file_index": 3, "first_line": 141, "local": true }, { - "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1738 ~ core[7ff5]::ptr::metadata::Pointee::Metadata) })", + "name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1738 ~ core[93bd]::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 14c36ec9..69ac3fca 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(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:13 ~ trait[3dda]::{impl#0}::bar::'_), '_) }) Bar)->i32", + "name": "/trait/::bar(&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:13 ~ trait[0a94]::{impl#0}::bar::'_), '_) }) Bar)->i32", "file_index": 0, "first_line": 14, "local": true diff --git a/rust-toolchain.toml b/rust-toolchain.toml index cc7ed982..d5438be4 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-10-22" +channel = "nightly-2023-10-29" components = ["clippy", "rustfmt", "rustc-dev", "rust-src", "rust-std", "llvm-tools-preview"]