Update Rust toolchain (#133)

* Update Rust toolchain

* some small refactors

* some small refactors

* Fix some small issues

* clippy

* remove temporary failing test

* WIP

* WIP

* Update

* cargo fmt

Author: zgrannan

Cargo.lock

@@ -15,7 +15,7 @@ default = ["visualization"]
 pcg-macros = { path = "pcg-macros" }
 bytes = "1.11.1" # Earlier versions have security issues
 bit-set = "0.8.0"
-bumpalo = {version = "3.16.0", features = ["allocator_api"]}
+bumpalo = {version = "3.19.1", features = ["allocator_api"]}
 derive_more = { version = "2.0.1", features = ["full"] }
 dot = "0.1"
 itertools = "0.12.0"

Cargo.toml

@@ -44,7 +44,7 @@ pub unsafe fn take_stored_body(tcx: TyCtxt<'_>, def_id: LocalDefId) -> BodyWithB
 }
 
 pub fn set_mir_borrowck(_session: &Session, providers: &mut Providers) {
-    providers.mir_borrowck = mir_borrowck;
+    providers.queries.mir_borrowck = mir_borrowck;
 }
 
 #[rustversion::before(2025-07-01)]
@@ -65,8 +65,8 @@ fn mir_borrowck(tcx: TyCtxt<'_>, def_id: LocalDefId) -> MirBorrowck<'_> {
 
 fn original_mir_borrowck(tcx: TyCtxt<'_>, def_id: LocalDefId) -> MirBorrowck<'_> {
     let mut providers = Providers::default();
-    borrowck::provide(&mut providers);
-    let original_mir_borrowck = providers.mir_borrowck;
+    borrowck::provide(&mut providers.queries);
+    let original_mir_borrowck = providers.queries.mir_borrowck;
     original_mir_borrowck(tcx, def_id)
 }
 

borrowck-body-storage/src/lib.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use borrowck_body_storage::{set_mir_borrowck, take_stored_body};
-use pcg::utils::PcgSettings;
+use pcg::utils::{PcgSettings, display::DisplayWithCtxt};
 use pcg::{
     HasSettings, PcgCtxtCreator, PcgOutput,
     borrow_checker::r#impl::{NllBorrowCheckerImpl, PoloniusBorrowChecker},
@@ -211,7 +211,9 @@ fn emit_and_check_annotations(
         let mut debug_lines = Vec::new();
 
         if let Some(err) = output.first_error() {
-            debug_lines.push(format!("{err:?}"));
+            let err_string = err.test_string(ctxt);
+            eprintln!("// PCG: {err_string}");
+            debug_lines.push(err.test_string(ctxt));
         }
         for block in ctxt.body().basic_blocks.indices() {
             if let Ok(Some(state)) = output.get_all_for_bb(block) {
@@ -227,7 +229,8 @@ fn emit_and_check_annotations(
         }
         if check_pcg_annotations {
             if let Ok(source) = ctxt.source_lines() {
-                let debug_lines_set: FxHashSet<_> = debug_lines.into_iter().collect();
+                let debug_lines_set: FxHashSet<String> =
+                    debug_lines.into_iter().map(|l| l.into_owned()).collect();
                 let expected_annotations = source
                     .iter()
                     .flat_map(|l| l.split("// PCG: ").nth(1))

pcg-bin/Cargo.lock

@@ -6,7 +6,7 @@ mod callbacks;
 
 use borrowck_body_storage::set_mir_borrowck;
 
-use pcg::rustc_interface::driver::{self, args};
+use pcg::rustc_interface::driver::{self, args, HandledOptions};
 use pcg::rustc_interface::interface;
 use pcg::rustc_interface::session::EarlyDiagCtxt;
 use pcg::rustc_interface::session::config::{self, ErrorOutputType};
@@ -52,8 +52,9 @@ fn main() {
     }
     let mut default_early_dcx = EarlyDiagCtxt::new(ErrorOutputType::default());
     let args = args::arg_expand_all(&default_early_dcx, &rustc_args);
-    let Some(matches) = driver::handle_options(&default_early_dcx, &args) else {
-        return;
+    let matches = match driver::handle_options(&default_early_dcx, &args) {
+        HandledOptions::None => return,
+        HandledOptions::Normal(m) | HandledOptions::HelpOnly(m) => m,
     };
     let sopts = config::build_session_options(&mut default_early_dcx, &matches);
     assert!(matches.free.len() == 1, "Expected exactly one input file");
@@ -77,7 +78,6 @@ fn main() {
         make_codegen_backend: None,
         registry: driver::diagnostics_registry(),
         using_internal_features: &driver::USING_INTERNAL_FEATURES,
-        expanded_args: args,
     };
     interface::run_compiler(config, |compiler| {
         let sess = &compiler.sess;

pcg-bin/src/callbacks.rs

@@ -5,7 +5,11 @@ extern crate rustc_hir;
 extern crate rustc_interface;
 extern crate rustc_middle;
 
-use std::{fs, io, path::Path, sync::Arc};
+use std::{
+    fs, io,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
 
 use borrowck_body_storage::{set_mir_borrowck, take_stored_body};
 use pcg::{
@@ -39,6 +43,10 @@ impl FileLoader for StringLoader {
     fn read_binary_file(&self, path: &Path) -> io::Result<Arc<[u8]>> {
         Ok(fs::read(path)?.into())
     }
+
+    fn current_directory(&self) -> io::Result<PathBuf> {
+        std::env::current_dir()
+    }
 }
 
 type TestCallback = dyn for<'a, 'tcx> Fn(PcgAnalysisResults<'a, 'tcx>) + Send + Sync + 'static;

pcg-bin/src/main.rs

@@ -282,34 +282,6 @@ fn main() {
         });
     });
 
-    let input = r#"
-            fn main() {
-                use std::time::Instant;
-                fn run_expensive_calculation(){}
-                let start = Instant::now();
-                run_expensive_calculation();
-                let elapsed = start.elapsed();
-                println!("Elapsed: {}s", elapsed.as_secs());
-            }"#;
-    run_pcg_on_str(input, |mut analysis| {
-        let ctxt = analysis.ctxt();
-
-        let temp_9: mir::Place<'_> = mir::Local::from(9_usize).into();
-        let deref_temp_9 = temp_9.project_deeper(&[mir::ProjectionElem::Deref], ctxt.tcx());
-
-        let temp_19: mir::Place<'_> = mir::Local::from(19_usize).into();
-
-        check_all_statements(&ctxt.body(), &mut analysis, |location, stmt| {
-            assert!(
-                !stmt
-                    .aliases(deref_temp_9, &ctxt.body(), ctxt.tcx())
-                    .contains(&temp_19),
-                "Bad alias for {:?}",
-                location
-            );
-        });
-    });
-
     // From flowistry_basic.rs
     let input = r#"
     fn main() {

pcg-tests/Cargo.lock

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-09-04"
+channel = "nightly-2026-01-22"
 components = [ "rustc-dev", "llvm-tools-preview", "rust-std", "rustfmt", "clippy" ]
 profile = "minimal"