From c999902fd08b1cdcf7e03ee0e770751303f2f181 Mon Sep 17 00:00:00 2001 From: Herman Venter Date: Fri, 4 Aug 2023 15:48:38 -0700 Subject: [PATCH] nightly-2023-08-04 (#1232) --- Cargo.lock | 37 ++++++++++---------- binaries/summary_store.tar | Bin 2991104 -> 2991104 bytes checker/src/block_visitor.rs | 15 +++------ checker/src/call_graph.rs | 5 +-- checker/src/call_visitor.rs | 1 - checker/src/known_names.rs | 43 ++++++++++++------------ checker/src/summaries.rs | 4 +-- checker/src/type_visitor.rs | 16 ++++----- checker/src/utils.rs | 16 +++++---- checker/tests/call_graph/fnptr_fold.rs | 8 ++--- checker/tests/call_graph/static_fold.rs | 8 ++--- rust-toolchain.toml | 2 +- 12 files changed, 74 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9da89a6b..61bc71e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -118,9 +118,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -300,9 +303,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -493,9 +496,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -802,9 +805,9 @@ checksum = "8ba09476327c4b70ccefb6180f046ef588c26a24cf5d269a9feba316eb4f029f" [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f" dependencies = [ "bitflags 2.3.3", "errno", @@ -845,22 +848,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.178" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60363bdd39a7be0266a520dab25fdc9241d2f987b08a01e01f0ec6d06a981348" +checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.178" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28482318d6641454cb273da158647922d1be6b5a2fcc6165cd89ebdd7ed576b" +checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -951,9 +954,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -1030,7 +1033,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] diff --git a/binaries/summary_store.tar b/binaries/summary_store.tar index 1f5a336930c0ef011df8ab16a9a46ab22b9339f4..99070c7f5a36a3d1bc03a4c6957f24f6324ae89e 100644 GIT binary patch delta 327 zcmYk&OHRU26vlCn&>|{@3WzVX<>7-za_Q?Xz)cwkO2VK68PJK0ScQpf!CkPF>z|M` zJ;`r!zI=mo=6}C3$7<<@L82oacxsj;ad_m#ng5z8|3~CY3Zd3`E9bDlWH@L+ey12)~S}e~vs`>VA s%+4^MnMobngO48i7+{D;JmDEH7-5Xb*0HA_-^CBaL6RT2mCe-H|K=r0X#fBK delta 327 zcmYk&O-=$q5Qbq2oB>5fendb8d-zu%>5+jxfcNnTO2UE#ES!z5h=(wdD{u?WzzLd{ zkdUd$v#Bq&sG4p6WrnX+A<#y@nz7QsbQ%H5K uZ|%-fpZnj1=PLMUqJ=g(=%R-{p7DYKh8xcveSF71FbT%zBR8@hS@!_#IZ3hr diff --git a/checker/src/block_visitor.rs b/checker/src/block_visitor.rs index 4fd5e735..7d45c26a 100644 --- a/checker/src/block_visitor.rs +++ b/checker/src/block_visitor.rs @@ -113,9 +113,7 @@ impl<'block, 'analysis, 'compilation, 'tcx> BlockVisitor<'block, 'analysis, 'com let mir::Statement { kind, source_info } = statement; self.bv.current_span = source_info.span; match kind { - mir::StatementKind::Assign(box (place, rvalue)) => { - self.visit_assign(place, rvalue.borrow()) - } + mir::StatementKind::Assign(box (place, rvalue)) => self.visit_assign(place, rvalue), mir::StatementKind::ConstEvalCounter => (), mir::StatementKind::FakeRead(..) => assume_unreachable!(), mir::StatementKind::SetDiscriminant { @@ -806,9 +804,7 @@ impl<'block, 'analysis, 'compilation, 'tcx> BlockVisitor<'block, 'analysis, 'com for (path, val) in newly_discovered_paths.iter() { paths_that_can_reach_functions.insert(path.clone()); let root = path.get_path_root().clone(); - let entry = roots_that_can_reach_functions - .entry(root) - .or_insert_with(Vec::new); + let entry = roots_that_can_reach_functions.entry(root).or_default(); entry.push((path.clone(), val.clone())); } newly_discovered_paths.clear(); @@ -3514,8 +3510,6 @@ impl<'block, 'analysis, 'compilation, 'tcx> BlockVisitor<'block, 'analysis, 'com self.bv.update_value_at(discr_path, discr_data.clone()); if discr_has_data { - use std::ops::Deref; - // Obtains the name of this variant. let name = { let enum_def = ty.ty_adt_def().unwrap(); @@ -3531,7 +3525,7 @@ impl<'block, 'analysis, 'compilation, 'tcx> BlockVisitor<'block, 'analysis, 'com Path::new_qualified( target_path.clone(), Rc::new(PathSelector::Downcast( - Rc::from(name_str.deref()), + Rc::from(name_str), discr_index.as_usize(), discr_data, )), @@ -4068,10 +4062,9 @@ impl<'block, 'analysis, 'compilation, 'tcx> BlockVisitor<'block, 'analysis, 'com from_end: *from_end, }, mir::ProjectionElem::Downcast(name, index) => { - use std::ops::Deref; let name_str = match name { None => Rc::from(format!("variant#{}", index.as_usize())), - Some(name) => Rc::from(name.as_str().deref()), + Some(name) => Rc::from(name.as_str()), }; let tag_value = if let TyKind::Adt(def, _) = base_ty.kind() { if def.is_enum() { diff --git a/checker/src/call_graph.rs b/checker/src/call_graph.rs index 1748e8c1..968e9a25 100644 --- a/checker/src/call_graph.rs +++ b/checker/src/call_graph.rs @@ -443,10 +443,7 @@ impl<'tcx> CallGraph<'tcx> { /// Add a dominance relationship to the call graph. /// Denotes that `defid1` is dominated by `defid2`. pub fn add_dom(&mut self, defid1: DefId, defid2: DefId) { - self.dominance - .entry(defid1) - .or_insert_with(HashSet::::new) - .insert(defid2); + self.dominance.entry(defid1).or_default().insert(defid2); } /// Add a new EdgeType to the call graph's `edge_types`. diff --git a/checker/src/call_visitor.rs b/checker/src/call_visitor.rs index 0d500404..9392be5b 100644 --- a/checker/src/call_visitor.rs +++ b/checker/src/call_visitor.rs @@ -234,7 +234,6 @@ impl<'call, 'block, 'analysis, 'compilation, 'tcx> }; if let Some(Ok(Some(instance))) = resolved_instance { let resolved_def_id = instance.def.def_id(); - let tcx = tcx; let has_mir = tcx.is_mir_available(resolved_def_id); if !has_mir && self.callee_known_name == KnownNames::StdCloneClone { return; diff --git a/checker/src/known_names.rs b/checker/src/known_names.rs index f744f25b..4e67b12f 100644 --- a/checker/src/known_names.rs +++ b/checker/src/known_names.rs @@ -140,7 +140,6 @@ impl KnownNamesCache { /// Uses information obtained from tcx to figure out which well known name (if any) /// this def id corresponds to. fn get_known_name_for(tcx: TyCtxt<'_>, def_id: DefId) -> KnownNames { - use std::ops::Deref; use DefPathData::*; let def_path = &tcx.def_path(def_id); @@ -177,7 +176,7 @@ impl KnownNamesCache { let get_known_name_for_alloc_namespace = |mut def_path_data_iter: Iter<'_>| { if is_foreign_module(def_path_data_iter.next()) { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "__rust_alloc" => KnownNames::RustAlloc, "__rust_alloc_zeroed" => KnownNames::RustAllocZeroed, "__rust_dealloc" => KnownNames::RustDealloc, @@ -192,7 +191,7 @@ impl KnownNamesCache { let get_known_name_for_clone_trait = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "clone" => KnownNames::StdCloneClone, _ => KnownNames::None, }) @@ -201,7 +200,7 @@ impl KnownNamesCache { let get_known_name_for_clone_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "Clone" => get_known_name_for_clone_trait(def_path_data_iter), _ => KnownNames::None, }) @@ -210,7 +209,7 @@ impl KnownNamesCache { let get_known_name_for_future_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "from_generator" => KnownNames::StdFutureFromGenerator, _ => KnownNames::None, }) @@ -220,7 +219,7 @@ impl KnownNamesCache { let get_known_name_for_instrinsics_foreign_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "arith_offset" => KnownNames::StdIntrinsicsArithOffset, "bitreverse" => KnownNames::StdIntrinsicsBitreverse, "bswap" => KnownNames::StdIntrinsicsBswap, @@ -296,7 +295,7 @@ impl KnownNamesCache { get_known_name_for_instrinsics_foreign_namespace(def_path_data_iter) } else { get_path_data_elem_name(current_elem) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "copy" => KnownNames::StdIntrinsicsCopy, "copy_nonoverlapping" => { KnownNames::StdIntrinsicsCopyNonOverlapping @@ -313,7 +312,7 @@ impl KnownNamesCache { let get_known_name_for_marker_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "PhantomData" => KnownNames::StdMarkerPhantomData, _ => KnownNames::None, }) @@ -322,7 +321,7 @@ impl KnownNamesCache { let get_known_name_for_mem_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "replace" => KnownNames::StdMemReplace, _ => KnownNames::None, }) @@ -331,9 +330,9 @@ impl KnownNamesCache { let get_known_name_for_ops_function_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "Fn" | "FnMut" | "FnOnce" => get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "call" => KnownNames::StdOpsFunctionFnCall, "call_mut" => KnownNames::StdOpsFunctionFnMutCallMut, "call_once" | "call_once_force" => { @@ -349,7 +348,7 @@ impl KnownNamesCache { let get_known_name_for_ops_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "function" => get_known_name_for_ops_function_namespace(def_path_data_iter), _ => KnownNames::None, }) @@ -358,7 +357,7 @@ impl KnownNamesCache { let get_known_name_for_panicking_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "assert_failed" => KnownNames::StdPanickingAssertFailed, "begin_panic" | "panic" => KnownNames::StdPanickingBeginPanic, "begin_panic_fmt" | "panic_fmt" => KnownNames::StdPanickingBeginPanicFmt, @@ -372,7 +371,7 @@ impl KnownNamesCache { def_path_data_iter.next(), ) { Some(0) => get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "write_bytes" => KnownNames::StdIntrinsicsWriteBytes, _ => KnownNames::None, }) @@ -382,7 +381,7 @@ impl KnownNamesCache { let get_known_name_for_ptr_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "swap_nonoverlapping" => KnownNames::StdPtrSwapNonOverlapping, "mut_ptr" => get_known_name_for_ptr_mut_ptr_namespace(def_path_data_iter), _ => KnownNames::None, @@ -395,7 +394,7 @@ impl KnownNamesCache { def_path_data_iter.next(), ) { Some(0) => get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "memcmp" => KnownNames::StdSliceCmpMemcmp, _ => KnownNames::None, }) @@ -408,7 +407,7 @@ impl KnownNamesCache { def_path_data_iter.next(), ) { Some(2) => get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "call_once" | "call_once_force" => KnownNames::StdOpsFunctionFnOnceCallOnce, _ => KnownNames::None, }) @@ -421,7 +420,7 @@ impl KnownNamesCache { def_path_data_iter.next(), ) { Some(1) => get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "MIN_NON_ZERO_CAP" => KnownNames::AllocRawVecMinNonZeroCap, _ => KnownNames::None, }) @@ -431,7 +430,7 @@ impl KnownNamesCache { let get_known_name_for_slice_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "cmp" => get_known_name_for_slice_cmp_namespace(def_path_data_iter), _ => KnownNames::None, }) @@ -441,7 +440,7 @@ impl KnownNamesCache { //get_known_name_for_sync_namespace let get_known_name_for_sync_namespace = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "once" => get_known_name_for_sync_once_namespace(def_path_data_iter), _ => KnownNames::None, }) @@ -450,7 +449,7 @@ impl KnownNamesCache { let get_known_name_for_known_crate = |mut def_path_data_iter: Iter<'_>| { get_path_data_elem_name(def_path_data_iter.next()) - .map(|n| match n.as_str().deref() { + .map(|n| match n.as_str() { "alloc" => get_known_name_for_alloc_namespace(def_path_data_iter), "clone" => get_known_name_for_clone_namespace(def_path_data_iter), "future" => get_known_name_for_future_namespace(def_path_data_iter), @@ -483,7 +482,7 @@ impl KnownNamesCache { }; let crate_name = tcx.crate_name(def_id.krate); - match crate_name.as_str().deref() { + match crate_name.as_str() { "alloc" | "core" | "mirai_annotations" | "std" => { get_known_name_for_known_crate(def_path_data_iter) } diff --git a/checker/src/summaries.rs b/checker/src/summaries.rs index 833e8176..5066fef7 100644 --- a/checker/src/summaries.rs +++ b/checker/src/summaries.rs @@ -526,7 +526,7 @@ impl<'a, 'tcx: 'a> PersistentSummaryCache<'tcx> { .clone(); self.typed_cache_table .entry(typed_cache_key) - .or_insert_with(HashMap::new) + .or_default() .entry(function_id) .or_insert(summary) }; @@ -647,7 +647,7 @@ impl<'a, 'tcx: 'a> PersistentSummaryCache<'tcx> { CallSiteKey::new(func_args.clone(), initial_type_cache.clone()); self.typed_cache_table .entry(typed_cache_key) - .or_insert_with(HashMap::new) + .or_default() .insert(func_id, summary); } else { self.typed_cache.insert(func_id, summary); diff --git a/checker/src/type_visitor.rs b/checker/src/type_visitor.rs index 9e85d011..b6624f43 100644 --- a/checker/src/type_visitor.rs +++ b/checker/src/type_visitor.rs @@ -142,7 +142,7 @@ impl<'tcx> TypeVisitor<'tcx> { match path_ty.kind() { TyKind::Closure(_, args) => { if utils::are_concrete(args) { - for (i, ty) in args.as_closure().upvar_tys().enumerate() { + for (i, ty) in args.as_closure().upvar_tys().iter().enumerate() { let var_type = ExpressionType::from(ty.kind()); let mut qualifier = path.clone(); if is_ref { @@ -159,7 +159,7 @@ impl<'tcx> TypeVisitor<'tcx> { } } TyKind::Generator(_, args, _) => { - for (i, ty) in args.as_generator().prefix_tys().enumerate() { + for (i, ty) in args.as_generator().prefix_tys().iter().enumerate() { let var_type = ExpressionType::from(ty.kind()); let mut qualifier = path.clone(); if is_ref { @@ -490,15 +490,15 @@ impl<'tcx> TypeVisitor<'tcx> { TyKind::Closure(def_id, args) => { let closure_substs = args.as_closure(); if closure_substs.is_valid() { - return closure_substs + return *closure_substs .upvar_tys() - .nth(*ordinal) + .get(*ordinal) .unwrap_or_else(|| { info!( "closure field not found {:?} {:?}", def_id, ordinal ); - self.tcx.types.never + &self.tcx.types.never }); } } @@ -518,16 +518,16 @@ impl<'tcx> TypeVisitor<'tcx> { // a sort of fat pointer? if let TyKind::Closure(def_id, args) = t.kind() { if utils::are_concrete(args) { - return args + return *args .as_closure() .upvar_tys() - .nth(*ordinal) + .get(*ordinal) .unwrap_or_else(|| { info!( "closure field not found {:?} {:?}", def_id, ordinal ); - self.tcx.types.never + &self.tcx.types.never }); } } else { diff --git a/checker/src/utils.rs b/checker/src/utils.rs index 40abc3a2..d670aa99 100644 --- a/checker/src/utils.rs +++ b/checker/src/utils.rs @@ -33,12 +33,15 @@ pub fn find_sysroot() -> String { let toolchain = option_env!("RUSTUP_TOOLCHAIN"); match (home, toolchain) { (Some(home), Some(toolchain)) => format!("{home}/toolchains/{toolchain}"), - _ => option_env!("RUST_SYSROOT") - .expect( - "Could not find sysroot. Specify the RUST_SYSROOT environment variable, \ + _ => match option_env!("RUST_SYSROOT") { + None => { + panic!( + "Could not find sysroot. Specify the RUST_SYSROOT environment variable, \ or use rustup to set the compiler to use for Mirai", - ) - .to_owned(), + ) + } + Some(sys_root) => sys_root.to_owned(), + }, } } @@ -411,11 +414,10 @@ pub fn is_foreign_contract(tcx: TyCtxt<'_>, def_id: DefId) -> bool { #[logfn_inputs(TRACE)] fn push_component_name(component_data: DefPathData, target: &mut String) { - use std::ops::Deref; use DefPathData::*; match component_data { TypeNs(name) | ValueNs(name) | MacroNs(name) | LifetimeNs(name) => { - target.push_str(name.as_str().deref()); + target.push_str(name.as_str()); } _ => target.push_str(match component_data { CrateRoot => "crate_root", diff --git a/checker/tests/call_graph/fnptr_fold.rs b/checker/tests/call_graph/fnptr_fold.rs index 64146c4f..d99eaf53 100644 --- a/checker/tests/call_graph/fnptr_fold.rs +++ b/checker/tests/call_graph/fnptr_fold.rs @@ -68,10 +68,10 @@ commit; /* EXPECTED:CALL_SITES{ "files": [ "tests/call_graph/fnptr_fold.rs", - "/rustc/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/std/src/io/stdio.rs", - "/rustc/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/core/src/fmt/mod.rs", - "/rustc/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/core/src/slice/mod.rs", - "/rustc/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/core/src/ptr/metadata.rs" + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/std/src/io/stdio.rs", + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/core/src/fmt/mod.rs", + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/core/src/slice/mod.rs", + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/core/src/ptr/metadata.rs" ], "callables": [ { diff --git a/checker/tests/call_graph/static_fold.rs b/checker/tests/call_graph/static_fold.rs index f24f7367..e6be0b0d 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/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/std/src/io/stdio.rs", - "/rustc/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/core/src/fmt/mod.rs", - "/rustc/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/core/src/slice/mod.rs", - "/rustc/500647fd8138cc09e87edb08d62f81654fbf6ef8/library/core/src/ptr/metadata.rs" + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/std/src/io/stdio.rs", + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/core/src/fmt/mod.rs", + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/core/src/slice/mod.rs", + "/rustc/474709a9a2a74a8bcf0055fadb335d0ca0d2d939/library/core/src/ptr/metadata.rs" ], "callables": [ { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 008bdd83..a24afcc2 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-07-28" +channel = "nightly-2023-08-04" components = [ "clippy", "rustfmt", "rustc-dev", "rust-src", "rust-std", "llvm-tools-preview" ]