Skip to content

Commit

Permalink
Update to nightly-2024-02-05
Browse files Browse the repository at this point in the history
  • Loading branch information
hermanventer committed Nov 13, 2024
1 parent b4cb5ec commit 20f6957
Show file tree
Hide file tree
Showing 20 changed files with 52 additions and 48 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified binaries/summary_store.tar
Binary file not shown.
2 changes: 1 addition & 1 deletion checker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ rayon = "*"
regex = "*"
rpds = { version = "*", features = ["serde"] }
rustc_tools_util = "*"
serde = { version = "*", features = ["derive", "alloc", "rc"] }
serde = { version = "=1.0.203", features = ["derive", "alloc", "rc"] }
serde_json = "*"
shellwords = "*"
sled = "*"
Expand Down
1 change: 1 addition & 0 deletions checker/src/block_visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2612,6 +2612,7 @@ impl<'block, 'analysis, 'compilation, 'tcx> BlockVisitor<'block, 'analysis, 'com
}
mir::AggregateKind::Closure(def_id, args)
| mir::AggregateKind::Coroutine(def_id, args) => {
//| mir::AggregateKind::CoroutineClosure(def_id, args) => {
let ty = self.bv.tcx.type_of(*def_id).skip_binder();
let func_const = self.visit_function_reference(*def_id, ty, Some(args));
let func_val = Rc::new(func_const.clone().into());
Expand Down
20 changes: 11 additions & 9 deletions checker/src/crate_visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@

use log::*;
use log_derive::{logfn, logfn_inputs};
use std::cell::RefCell;
use std::cmp::Ordering;
use std::collections::HashMap;
use std::fmt::{Debug, Formatter, Result};
use std::rc::Rc;
use std::time::Instant;

use mirai_annotations::*;
use rustc_errors::DiagnosticBuilder;
use rustc_hir::def_id::{DefId, DefIndex};
use rustc_middle::mir;
use rustc_middle::ty::{GenericArgsRef, TyCtxt};
use rustc_session::Session;
use std::cell::RefCell;
use std::cmp::Ordering;
use std::collections::HashMap;
use std::fmt::{Debug, Formatter, Result};
use std::rc::Rc;
use std::time::Instant;

use crate::body_visitor::BodyVisitor;
use crate::call_graph::CallGraph;
Expand Down Expand Up @@ -255,14 +254,17 @@ impl<'compilation, 'tcx> CrateVisitor<'compilation, 'tcx> {
let mut diags = vec![];
for (_, dbs) in self.diagnostics_for.drain() {
for db in dbs.into_iter() {
diags.push(db.into_diagnostic());
diags.push(db);
}
}
if !expected_errors.check_messages(diags) {
if !expected_errors.check_messages(&diags) {
self.session
.dcx()
.fatal(format!("test failed: {}", self.file_name));
}
for db in diags.into_iter() {
db.cancel();
}
} else {
let mut diagnostics = vec![];
for (_, dbs) in self.diagnostics_for.drain() {
Expand Down
7 changes: 4 additions & 3 deletions checker/src/expected_errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.

use rustc_errors::DiagnosticBuilder;
use std::fs::File;
use std::io::BufRead;
use std::io::BufReader;
Expand All @@ -12,7 +13,7 @@ use std::str::FromStr;
use log_derive::logfn_inputs;

use mirai_annotations::assume;
use rustc_errors::{Diagnostic, DiagnosticMessage, MultiSpan};
use rustc_errors::{DiagnosticMessage, MultiSpan};

/// A collection of error strings that are expected for a test case.
#[derive(Debug)]
Expand All @@ -33,9 +34,9 @@ impl ExpectedErrors {

/// Checks if the given set of diagnostics matches the expected diagnostics.
#[logfn_inputs(TRACE)]
pub fn check_messages(&mut self, diagnostics: Vec<Diagnostic>) -> bool {
pub fn check_messages(&mut self, diagnostics: &[DiagnosticBuilder<'_, ()>]) -> bool {
for diag in diagnostics.iter() {
if !self.remove_message(&diag.span, Self::expect_str(&diag.messages()[0].0)) {
if !self.remove_message(&diag.span, Self::expect_str(&diag.messages[0].0)) {
return false;
}
for child in &diag.children {
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ commit;
],
"callables": [
{
"name": "/fnptr/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr[4b14]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"name": "/fnptr/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr[fdde]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 9,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr_clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ commit;
],
"callables": [
{
"name": "/fnptr_clean/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_clean[bfda]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"name": "/fnptr_clean/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ fnptr_clean[a916]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 14,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr_deduplicate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ commit;
],
"callables": [
{
"name": "/fnptr_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_deduplicate[3719]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"name": "/fnptr_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_deduplicate[3b2b]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 10,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr_dom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ commit;
],
"callables": [
{
"name": "/fnptr_dom/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_dom[9e1e]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:8 ~ fnptr_dom[9e1e]::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[e5d3]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:8 ~ fnptr_dom[e5d3]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 9,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr_dom_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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[1093]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop[1093]::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[3c37]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop[3c37]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 9,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr_dom_loop_souffle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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[28d9]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop_souffle[28d9]::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[df85]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []),&ReBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrNamed(DefId(0:9 ~ fnptr_dom_loop_souffle[df85]::fn1::'_#1), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 10,
"local": true
Expand Down
18 changes: 9 additions & 9 deletions checker/tests/call_graph/fnptr_fold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ commit;
/* EXPECTED:CALL_SITES{
"files": [
"tests/call_graph/fnptr_fold.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/std/src/io/stdio.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/core/src/fmt/mod.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/core/src/slice/mod.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/core/src/ptr/metadata.rs"
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/library/std/src/io/stdio.rs",
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/library/core/src/fmt/mod.rs",
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/library/core/src/slice/mod.rs",
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/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[ed9a]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"name": "/fnptr_fold/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_fold[e384]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 10,
"local": true
Expand All @@ -99,25 +99,25 @@ commit;
"local": true
},
{
"name": "/std/std::io::_print(std::fmt::Arguments<ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(1:12967 ~ std[bf4d]::io::stdio::_print::'_), '_) })>)->()",
"name": "/std/std::io::_print(std::fmt::Arguments<ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(1:12968 ~ std[318d]::io::stdio::_print::'_), '_) })>)->()",
"file_index": 1,
"first_line": 1105,
"local": false
},
{
"name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9991 ~ core[8cf5]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments<ReEarlyParam(DefId(2:9991 ~ core[8cf5]::fmt::{impl#2}::'a), 0, 'a)>",
"name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9991 ~ core[b4ca]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments<ReEarlyParam(DefId(2:9991 ~ core[b4ca]::fmt::{impl#2}::'a), 0, 'a)>",
"file_index": 2,
"first_line": 321,
"local": true
},
{
"name": "/core/core::slice::<impl [T]>::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:60001 ~ core[8cf5]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize",
"name": "/core/core::slice::<impl [T]>::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:60001 ~ core[b4ca]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize",
"file_index": 3,
"first_line": 138,
"local": true
},
{
"name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1903 ~ core[8cf5]::ptr::metadata::Pointee::Metadata) })",
"name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1903 ~ core[b4ca]::ptr::metadata::Pointee::Metadata) })",
"file_index": 4,
"first_line": 94,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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[0288]::fn2::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"name": "/fnptr_loop/fn2(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_loop[a536]::fn2::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 12,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/fnptr_slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ commit;
],
"callables": [
{
"name": "/fnptr_slice/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_slice[7393]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"name": "/fnptr_slice/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ fnptr_slice[7b16]::fn1::'_), '_) }) Binder(fn(u32) -> u32, []))->u32",
"file_index": 0,
"first_line": 10,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ commit;
"local": true
},
{
"name": "/generic/Gen::<T>::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:12 ~ generic[f2c5]::{impl#0}::bar::'_), '_) }) Gen<T/#0>,T/#0)->()",
"name": "/generic/Gen::<T>::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:12 ~ generic[2055]::{impl#0}::bar::'_), '_) }) Gen<T/#0>,T/#0)->()",
"file_index": 0,
"first_line": 14,
"local": true
Expand Down
6 changes: 3 additions & 3 deletions checker/tests/call_graph/static_deduplicate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ commit;
],
"callables": [
{
"name": "/static_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[147e]::fn1::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[147e]::fn1::'_), '_) }) str)",
"name": "/static_deduplicate/fn1(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[24f6]::fn1::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:7 ~ static_deduplicate[24f6]::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[147e]::fn2::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[147e]::fn2::'_), '_) }) str)",
"name": "/static_deduplicate/fn2(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[24f6]::fn2::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:8 ~ static_deduplicate[24f6]::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[147e]::fn3::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[147e]::fn3::'_), '_) }) str)",
"name": "/static_deduplicate/fn3(u32,&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[24f6]::fn3::'_), '_) }) str)->(u32, &ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:9 ~ static_deduplicate[24f6]::fn3::'_), '_) }) str)",
"file_index": 0,
"first_line": 16,
"local": true
Expand Down
16 changes: 8 additions & 8 deletions checker/tests/call_graph/static_fold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ commit;
/* EXPECTED:CALL_SITES{
"files": [
"tests/call_graph/static_fold.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/std/src/io/stdio.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/core/src/fmt/mod.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/core/src/slice/mod.rs",
"/rustc/11f32b73e0dc9287e305b5b9980d24aecdc8c17f/library/core/src/ptr/metadata.rs"
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/library/std/src/io/stdio.rs",
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/library/core/src/fmt/mod.rs",
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/library/core/src/slice/mod.rs",
"/rustc/268dbbbc4b3fd71c5f360a4d0728295252430b5b/library/core/src/ptr/metadata.rs"
],
"callables": [
{
Expand Down Expand Up @@ -95,25 +95,25 @@ commit;
"local": true
},
{
"name": "/std/std::io::_print(std::fmt::Arguments<ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(1:12967 ~ std[bf4d]::io::stdio::_print::'_), '_) })>)->()",
"name": "/std/std::io::_print(std::fmt::Arguments<ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(1:12968 ~ std[318d]::io::stdio::_print::'_), '_) })>)->()",
"file_index": 1,
"first_line": 1105,
"local": false
},
{
"name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9991 ~ core[8cf5]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments<ReEarlyParam(DefId(2:9991 ~ core[8cf5]::fmt::{impl#2}::'a), 0, 'a)>",
"name": "/core/std::fmt::Arguments::<'a>::new_const(&ReEarlyParam(DefId(2:9991 ~ core[b4ca]::fmt::{impl#2}::'a), 0, 'a) [&ReStatic str])->std::fmt::Arguments<ReEarlyParam(DefId(2:9991 ~ core[b4ca]::fmt::{impl#2}::'a), 0, 'a)>",
"file_index": 2,
"first_line": 321,
"local": false
},
{
"name": "/core/core::slice::<impl [T]>::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:60001 ~ core[8cf5]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize",
"name": "/core/core::slice::<impl [T]>::len(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(2:60001 ~ core[b4ca]::slice::{impl#0}::len::'_), '_) }) [T/#0])->usize",
"file_index": 3,
"first_line": 138,
"local": true
},
{
"name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1903 ~ core[8cf5]::ptr::metadata::Pointee::Metadata) })",
"name": "/core/std::ptr::metadata(*const T/#0)->Alias(Projection, AliasTy { args: [T/#0], def_id: DefId(2:1903 ~ core[b4ca]::ptr::metadata::Pointee::Metadata) })",
"file_index": 4,
"first_line": 94,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion checker/tests/call_graph/trait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ commit;
"local": true
},
{
"name": "/trait/<Bar as Tr>::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:13 ~ trait[ba26]::{impl#0}::bar::'_), '_) }) Bar)->i32",
"name": "/trait/<Bar as Tr>::bar(&ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:13 ~ trait[d81f]::{impl#0}::bar::'_), '_) }) Bar)->i32",
"file_index": 0,
"first_line": 14,
"local": true
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2024-02-01"
channel = "nightly-2024-02-05"
components = ["clippy", "rustfmt", "rustc-dev", "rust-src", "rust-std", "llvm-tools-preview"]

0 comments on commit 20f6957

Please sign in to comment.