Merge pull request #115 from willcrichton/dev

Update to nightly-2026-05-01

Author: willcrichton

Cargo.lock

@@ -4,8 +4,8 @@ exclude = ["ide/src/tests/mock_project"]
 resolver = "2"
 
 [workspace.dependencies]
-rustc_plugin = "=0.14.2-nightly-2025-08-20"
-rustc_utils = {version = "=0.14.2-nightly-2025-08-20", features = ["indexical"]}
+rustc_plugin = "=0.15.0-nightly-2026-05-01"
+rustc_utils = {version = "=0.15.0-nightly-2026-05-01", features = ["indexical"]}
 indexical = {version = "0.9.3", default-features = false, features = ["rustc"]}
 
 [profile.bench]

Cargo.toml

@@ -22,8 +22,6 @@ extern crate rustc_interface;
 extern crate rustc_middle;
 extern crate rustc_span;
 
-use std::process::Command;
-
 use flowistry::infoflow::Direction;
 use rustc_borrowck::consumers::BodyWithBorrowckFacts;
 use rustc_hir::{BodyId, ItemKind};

crates/flowistry/examples/example.rs

@@ -259,7 +259,7 @@ impl<'a, 'tcx> Analysis<'tcx> for FlowAnalysis<'a, 'tcx> {
   }
 
   fn apply_primary_statement_effect(
-    &mut self,
+    &self,
     state: &mut Self::Domain,
     statement: &Statement<'tcx>,
     location: Location,
@@ -271,7 +271,7 @@ impl<'a, 'tcx> Analysis<'tcx> for FlowAnalysis<'a, 'tcx> {
   }
 
   fn apply_primary_terminator_effect<'mir>(
-    &mut self,
+    &self,
     state: &mut Self::Domain,
     terminator: &'mir Terminator<'tcx>,
     location: Location,
@@ -292,7 +292,7 @@ impl<'a, 'tcx> Analysis<'tcx> for FlowAnalysis<'a, 'tcx> {
   }
 
   fn apply_call_return_effect(
-    &mut self,
+    &self,
     _state: &mut Self::Domain,
     _block: BasicBlock,
     _return_places: CallReturnPlaces<'_, 'tcx>,

crates/flowistry/src/infoflow/analysis.rs

@@ -184,7 +184,7 @@ where
 
     match &terminator.kind {
       TerminatorKind::Call {
-        /*func,*/ // TODO: deal with func
+        func,
         args,
         destination,
         ..
@@ -211,6 +211,12 @@ where
           arg_inputs.clone()
         };
 
+        if let Some((def_id, _)) = func.const_fn_def()
+          && tcx.def_path_str(def_id) == "std::boxed::box_assume_init_into_vec_unsafe"
+        {
+          // TODO: we need to fix this case to fix vec_read...
+        }
+
         let mut mutations = vec![Mutation {
           mutated: *destination,
           inputs,

crates/flowistry/src/infoflow/mutation.rs

@@ -34,12 +34,7 @@
 
 #![feature(
   rustc_private,             // for rustc internals
-  box_patterns,              // for conciseness
-  associated_type_defaults,  // for crate::indexed::Indexed
   min_specialization,        // for rustc_index::newtype_index
-  type_alias_impl_trait,     // for impl Trait in trait definition, eg crate::mir::utils 
-  trait_alias,
-  negative_impls,
 )]
 #![allow(
   clippy::single_match,

crates/flowistry/src/lib.rs

@@ -1,6 +1,6 @@
 //! Alias analysis to determine the points-to set of a reference.
 
-use std::{hash::Hash, time::Instant};
+use std::time::Instant;
 
 use log::{debug, info};
 use rustc_borrowck::consumers::BodyWithBorrowckFacts;

crates/flowistry/src/mir/aliases.rs

@@ -54,7 +54,7 @@ pub fn iterate_to_fixpoint<'tcx, A: Analysis<'tcx>>(
   _tcx: TyCtxt<'tcx>,
   body: &Body<'tcx>,
   location_domain: Rc<LocationOrArgDomain>,
-  mut analysis: A,
+  analysis: A,
 ) -> AnalysisResults<'tcx, A> {
   let bottom_value = analysis.bottom_value(body);
 

crates/flowistry/src/mir/engine.rs

@@ -6,7 +6,7 @@ use rustc_middle::{
   mir::*,
   ty::{GenericArgKind, RegionKind, RegionVid, Ty, TyCtxt},
 };
-use rustc_span::source_map::Spanned;
+use rustc_span::Spanned;
 use rustc_utils::{BodyExt, OperandExt, PlaceExt};
 
 use crate::extensions::{MutabilityMode, is_extension_active};
@@ -32,8 +32,8 @@ pub fn arg_mut_ptrs<'tcx>(
     .flat_map(|(i, place)| {
       place
         .interior_pointers(tcx, body, def_id)
-        .into_iter()
-        .flat_map(|(_, places)| {
+        .into_values()
+        .flat_map(|places| {
           places
             .into_iter()
             .filter_map(|(place, mutability)| match mutability {
@@ -101,8 +101,8 @@ impl<'a, 'tcx> AsyncHack<'a, 'tcx> {
       Some(context_ty) => {
         self
           .tcx
-          .erase_regions(place.ty(&self.body.local_decls, self.tcx).ty)
-          == self.tcx.erase_regions(context_ty)
+          .erase_and_anonymize_regions(place.ty(&self.body.local_decls, self.tcx).ty)
+          == self.tcx.erase_and_anonymize_regions(context_ty)
       }
       None => false,
     }

crates/flowistry/src/mir/utils.rs

@@ -0,0 +1,6 @@
+fn main() {
+  let x = 1;
+  let y = Box::new(x);
+  let z = *y;
+  `(z)`;
+}