Merge pull request #101 from willcrichton/dev

Update to nightly-2024-12-15, prepare 0.5.43

Author: willcrichton

Cargo.lock

@@ -4,8 +4,8 @@ exclude = ["ide/src/tests/mock_project"]
 resolver = "2"
 
 [workspace.dependencies]
-rustc_plugin = "=0.11.0-nightly-2024-12-01"
-rustc_utils = {version = "=0.11.0-nightly-2024-12-01", features = ["indexical"]}
+rustc_plugin = "=0.12.0-nightly-2024-12-15"
+rustc_utils = {version = "=0.12.0-nightly-2024-12-15", features = ["indexical"]}
 indexical = {version = "0.3.1", default-features = false, features = ["rustc"]}
 
 [profile.bench]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flowistry"
-version = "0.5.42"
+version = "0.5.43"
 edition = "2021"
 authors = ["Will Crichton <[email protected]>"]
 description = "Modular information flow analysis"

crates/flowistry/Cargo.toml

@@ -174,9 +174,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let mut callbacks = Callbacks { group };
         rustc_driver::catch_fatal_errors(|| {
-          rustc_driver::RunCompiler::new(&args, &mut callbacks)
-            .run()
-            .unwrap()
+          rustc_driver::RunCompiler::new(&args, &mut callbacks).run();
         })
         .unwrap();
       }

crates/flowistry/benches/main.rs

@@ -139,9 +139,7 @@ fn main() {
   // Run rustc with the given arguments
   let mut callbacks = Callbacks;
   rustc_driver::catch_fatal_errors(|| {
-    rustc_driver::RunCompiler::new(&args, &mut callbacks)
-      .run()
-      .unwrap()
+    rustc_driver::RunCompiler::new(&args, &mut callbacks).run();
   })
   .unwrap();
 }

crates/flowistry/examples/example.rs

@@ -255,7 +255,7 @@ impl<'a, 'tcx> Analysis<'tcx> for FlowAnalysis<'a, 'tcx> {
     }
   }
 
-  fn apply_statement_effect(
+  fn apply_primary_statement_effect(
     &mut self,
     state: &mut Self::Domain,
     statement: &Statement<'tcx>,
@@ -267,7 +267,7 @@ impl<'a, 'tcx> Analysis<'tcx> for FlowAnalysis<'a, 'tcx> {
     .visit_statement(statement, location);
   }
 
-  fn apply_terminator_effect<'mir>(
+  fn apply_primary_terminator_effect<'mir>(
     &mut self,
     state: &mut Self::Domain,
     terminator: &'mir Terminator<'tcx>,

crates/flowistry/src/infoflow/analysis.rs

@@ -85,11 +85,19 @@ pub fn iterate_to_fixpoint<'tcx, A: Analysis<'tcx>>(
     };
     let next_locs = match body.stmt_at(location) {
       Either::Left(statement) => {
-        analysis.apply_statement_effect(&mut state[loc_index], statement, location);
+        analysis.apply_primary_statement_effect(
+          &mut state[loc_index],
+          statement,
+          location,
+        );
         vec![location.successor_within_block()]
       }
       Either::Right(terminator) => {
-        analysis.apply_terminator_effect(&mut state[loc_index], terminator, location);
+        analysis.apply_primary_terminator_effect(
+          &mut state[loc_index],
+          terminator,
+          location,
+        );
         body
           .basic_blocks
           .successors(location.block)

crates/flowistry/src/mir/engine.rs

@@ -1,6 +1,6 @@
 [package]
 name = "flowistry_ide"
-version = "0.5.42"
+version = "0.5.43"
 edition = "2021"
 authors = ["Will Crichton <[email protected]>"]
 description = "Information Flow in the IDE for Rust"
@@ -14,7 +14,7 @@ rustc_private = true
 decompose = ["petgraph", "rayon"]
 
 [dependencies]
-flowistry = {version = "0.5.42", path = "../flowistry"}
+flowistry = {version = "0.5.43", path = "../flowistry"}
 anyhow = "1"
 log = "0.4"
 fluid-let = "1.0"

crates/flowistry_ide/Cargo.toml

@@ -219,7 +219,11 @@ fn postprocess<T: Serialize>(result: FlowistryResult<T>) -> RustcResult<()> {
   let result = match result {
     Ok(output) => Ok(output),
     Err(e) => match e {
-      FlowistryError::BuildError(e) => return Err(e),
+      FlowistryError::BuildError =>
+      {
+        #[allow(deprecated)]
+        return Err(ErrorGuaranteed::unchecked_error_guaranteed())
+      }
       e => Err(e),
     },
   };
@@ -248,7 +252,11 @@ pub fn run_with_callbacks(
   );
 
   let compiler = rustc_driver::RunCompiler::new(&args, callbacks);
-  compiler.run().map_err(FlowistryError::BuildError)
+
+  rustc_driver::catch_fatal_errors(move || {
+    compiler.run();
+  })
+  .map_err(|_| FlowistryError::BuildError)
 }
 
 fn run<A: FlowistryAnalysis, T: ToSpan>(
@@ -280,7 +288,7 @@ fn run<A: FlowistryAnalysis, T: ToSpan>(
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 pub enum FlowistryError {
-  BuildError(#[serde(skip_serializing)] ErrorGuaranteed),
+  BuildError,
   AnalysisError { error: String },
   FileNotFound,
 }
@@ -321,26 +329,22 @@ impl<A: FlowistryAnalysis, T: ToSpan, F: FnOnce() -> T> rustc_driver::Callbacks
     config.override_queries = Some(borrowck_facts::override_queries);
   }
 
-  fn after_expansion<'tcx>(
+  fn after_analysis<'tcx>(
     &mut self,
     _compiler: &rustc_interface::interface::Compiler,
-    queries: &'tcx rustc_interface::Queries<'tcx>,
+    tcx: TyCtxt<'tcx>,
   ) -> rustc_driver::Compilation {
     elapsed("rustc", self.rustc_start);
     fluid_set!(EVAL_MODE, self.eval_mode.unwrap_or_default());
 
-    let start = Instant::now();
-    queries.global_ctxt().unwrap().enter(|tcx| {
-      elapsed("global_ctxt", start);
-      let mut analysis = self.analysis.take().unwrap();
-      self.output = Some((|| {
-        let target = (self.compute_target.take().unwrap())().to_span(tcx)?;
-        debug!("target span: {target:?}");
-        let mut bodies = find_enclosing_bodies(tcx, target);
-        let body = bodies.next().context("Selection did not map to a body")?;
-        analysis.analyze(tcx, body)
-      })());
-    });
+    let mut analysis = self.analysis.take().unwrap();
+    self.output = Some((|| {
+      let target = (self.compute_target.take().unwrap())().to_span(tcx)?;
+      debug!("target span: {target:?}");
+      let mut bodies = find_enclosing_bodies(tcx, target);
+      let body = bodies.next().context("Selection did not map to a body")?;
+      analysis.analyze(tcx, body)
+    })());
 
     rustc_driver::Compilation::Stop
   }

crates/flowistry_ide/src/plugin.rs

@@ -1,14 +1,14 @@
 [package]
 name = "flowistry_ifc"
-version = "0.5.42"
+version = "0.5.43"
 edition = "2021"
 publish = false
 
 [package.metadata.rust-analyzer]
 rustc_private = true
 
 [dependencies]
-flowistry = {version = "0.5.42", path = "../flowistry"}
+flowistry = {version = "0.5.43", path = "../flowistry"}
 env_logger = "0.9"
 termcolor = "1.1"
 anyhow = "1"

crates/flowistry_ifc/Cargo.toml

@@ -50,7 +50,8 @@ impl RustcPlugin for IfcPlugin {
     compiler_args: Vec<String>,
     _plugin_args: Self::Args,
   ) -> rustc_interface::interface::Result<()> {
-    rustc_driver::RunCompiler::new(&compiler_args, &mut Callbacks).run()
+    rustc_driver::RunCompiler::new(&compiler_args, &mut Callbacks).run();
+    Ok(())
   }
 }
 

crates/flowistry_ifc/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "flowistry_ifc_traits"
-version = "0.5.42"
+version = "0.5.43"
 edition = "2021"
 publish = false
 

crates/flowistry_ifc_traits/Cargo.toml

@@ -12,7 +12,7 @@
     "type": "git"
   },
   "description": "Information Flow in the IDE for Rust",
-  "version": "0.5.42",
+  "version": "0.5.43",
   "engines": {
     "vscode": "^1.54.0"
   },

ide/package-lock.json

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-12-01"
+channel = "nightly-2024-12-15"
 components = ["rust-src", "rustc-dev", "llvm-tools-preview"]