Update to nightly-2025-03-02

Author: willcrichton

crates/rustc_plugin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustc_plugin"
-version = "0.12.0-nightly-2024-12-15"
+version = "0.13.0-nightly-2025-03-02"
 edition = "2021"
 authors = ["Will Crichton <crichton.will@gmail.com>"]
 description = "A framework for writing plugins that integrate with the Rust compiler"

crates/rustc_plugin/examples/print-all-items/Cargo.toml

@@ -8,6 +8,6 @@ rustc_private = true
 
 [dependencies]
 rustc_plugin = { path = "../.." }
-env_logger = "0.10"
+env_logger = {version = "0.10", default-features = false}
 clap = {version = "4.4", features = ["derive"]}
 serde = {version = "1", features = ["derive"]}

crates/rustc_plugin/examples/print-all-items/rust-toolchain.toml

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

crates/rustc_plugin/examples/print-all-items/src/lib.rs

@@ -3,13 +3,18 @@
 #![feature(rustc_private)]
 
 extern crate rustc_driver;
+extern crate rustc_hir;
 extern crate rustc_interface;
 extern crate rustc_middle;
 extern crate rustc_session;
 
 use std::{borrow::Cow, env, process::Command};
 
 use clap::Parser;
+use rustc_hir::{
+  intravisit::{self, Visitor},
+  Item,
+};
 use rustc_middle::ty::TyCtxt;
 use rustc_plugin::{CrateFilter, RustcPlugin, RustcPluginArgs, Utf8Path};
 use serde::{Deserialize, Serialize};
@@ -61,15 +66,16 @@ impl RustcPlugin for PrintAllItemsPlugin {
     compiler_args: Vec<String>,
     plugin_args: Self::Args,
   ) -> rustc_interface::interface::Result<()> {
-    let mut callbacks = PrintAllItemsCallbacks { args: plugin_args };
-    let compiler = rustc_driver::RunCompiler::new(&compiler_args, &mut callbacks);
-    compiler.run();
+    let mut callbacks = PrintAllItemsCallbacks {
+      args: Some(plugin_args),
+    };
+    rustc_driver::run_compiler(&compiler_args, &mut callbacks);
     Ok(())
   }
 }
 
 struct PrintAllItemsCallbacks {
-  args: PrintAllItemsPluginArgs,
+  args: Option<PrintAllItemsPluginArgs>,
 }
 
 impl rustc_driver::Callbacks for PrintAllItemsCallbacks {
@@ -82,7 +88,7 @@ impl rustc_driver::Callbacks for PrintAllItemsCallbacks {
     tcx: TyCtxt<'_>,
   ) -> rustc_driver::Compilation {
     // We call our top-level function with access to the type context `tcx` and the CLI arguments.
-    print_all_items(tcx, &self.args);
+    print_all_items(tcx, self.args.take().unwrap());
 
     // Note that you should generally allow compilation to continue. If
     // your plugin is being invoked on a dependency, then you need to ensure
@@ -92,21 +98,29 @@ impl rustc_driver::Callbacks for PrintAllItemsCallbacks {
   }
 }
 
-// The core of our analysis. It doesn't do much, just access some methods on the `TyCtxt`.
+// The core of our analysis. Right now it just prints out a description of each item.
 // I recommend reading the Rustc Development Guide to better understand which compiler APIs
 // are relevant to whatever task you have.
-fn print_all_items(tcx: TyCtxt, args: &PrintAllItemsPluginArgs) {
-  let hir = tcx.hir();
-  for item_id in hir.items() {
-    let item = hir.item(item_id);
+fn print_all_items(tcx: TyCtxt, args: PrintAllItemsPluginArgs) {
+  tcx.hir_visit_all_item_likes_in_crate(&mut PrintVisitor { args });
+}
+
+struct PrintVisitor {
+  args: PrintAllItemsPluginArgs,
+}
+
+impl Visitor<'_> for PrintVisitor {
+  fn visit_item(&mut self, item: &Item) -> Self::Result {
     let mut msg = format!(
       "There is an item \"{}\" of type \"{}\"",
       item.ident,
       item.kind.descr()
     );
-    if args.allcaps {
+    if self.args.allcaps {
       msg = msg.to_uppercase();
     }
     println!("{msg}");
+
+    intravisit::walk_item(self, item)
   }
 }

crates/rustc_plugin/src/driver.rs

@@ -152,7 +152,7 @@ pub fn driver_main<T: RustcPlugin>(plugin: T) {
       log::debug!("Running plugin...");
       let plugin_args: T::Args =
         serde_json::from_str(&env::var(PLUGIN_ARGS).unwrap()).unwrap();
-      plugin.run(args, plugin_args)
+      plugin.run(args, plugin_args).unwrap();
     } else {
       log::debug!(
         "Running normal Rust. Relevant variables:\
@@ -161,8 +161,7 @@ run_on_all_crates={run_on_all_crates}, \
 primary_package={primary_package}, \
 is_target_crate={is_target_crate}"
       );
-      rustc_driver::RunCompiler::new(&args, &mut DefaultCallbacks).run();
-      Ok(())
+      rustc_driver::run_compiler(&args, &mut DefaultCallbacks);
     }
   }))
 }

crates/rustc_utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustc_utils"
-version = "0.12.0-nightly-2024-12-15"
+version = "0.13.0-nightly-2025-03-02"
 edition = "2021"
 authors = ["Will Crichton <crichton.will@gmail.com>"]
 description = "Utilities for working with the Rust compiler"
@@ -27,7 +27,7 @@ serde = {version = "1", features = ["derive"], optional = true}
 textwrap = {version = "0.16", optional = true}
 regex = {version = "1", optional = true}
 ts-rs = {version = "7", optional = true}
-indexical = {version = "0.3.1", default-features = false, features = ["rustc"], optional = true}
+indexical = {version = "0.7.0", default-features = false, features = ["rustc"], optional = true}
 
 [dev-dependencies]
 rustc_utils = {path = ".", features = ["test"]}

crates/rustc_utils/src/lib.rs

@@ -41,6 +41,7 @@
 )]
 
 extern crate either;
+extern crate rustc_abi;
 extern crate rustc_borrowck;
 extern crate rustc_data_structures;
 extern crate rustc_driver;
@@ -50,6 +51,7 @@ extern crate rustc_hir;
 extern crate rustc_index;
 extern crate rustc_infer;
 extern crate rustc_interface;
+extern crate rustc_lint_defs;
 extern crate rustc_macros;
 extern crate rustc_middle;
 extern crate rustc_mir_dataflow;

crates/rustc_utils/src/mir/body.rs

@@ -137,7 +137,7 @@ impl<'tcx> BodyExt<'tcx> for Body<'tcx> {
 
   fn source_info_to_hir_id(&self, info: &SourceInfo) -> HirId {
     let scope = &self.source_scopes[info.scope];
-    let local_data = scope.local_data.as_ref().assert_crate_local();
+    let local_data = scope.local_data.as_ref().unwrap_crate_local();
     local_data.lint_root
   }
 

crates/rustc_utils/src/mir/control_dependencies.rs

@@ -13,15 +13,15 @@ use rustc_data_structures::graph::{
   DirectedGraph, Predecessors, StartNode, Successors,
 };
 use rustc_index::{
-  bit_set::{BitSet, SparseBitMatrix},
+  bit_set::{DenseBitSet, MixedBitSet, SparseBitMatrix},
   Idx,
 };
 use smallvec::SmallVec;
 
 struct ReversedGraph<'a, G: ControlFlowGraph> {
   graph: &'a G,
   exit: G::Node,
-  unreachable: BitSet<G::Node>,
+  unreachable: MixedBitSet<G::Node>,
 }
 
 impl<G: ControlFlowGraph> DirectedGraph for ReversedGraph<'_, G> {
@@ -76,7 +76,7 @@ impl<Node: Idx> PostDominators<Node> {
     let mut reversed = ReversedGraph {
       graph,
       exit,
-      unreachable: BitSet::new_empty(num_nodes),
+      unreachable: MixedBitSet::new_empty(num_nodes),
     };
 
     let reachable = iterate::post_order_from(&reversed, exit);
@@ -194,7 +194,7 @@ impl<Node: Idx + Ord> ControlDependencies<Node> {
   }
 
   /// Returns the set of all node that are control-dependent on the given `node`.
-  pub fn dependent_on(&self, node: Node) -> Option<&BitSet<Node>> {
+  pub fn dependent_on(&self, node: Node) -> Option<&DenseBitSet<Node>> {
     self.0.row(node)
   }
 }

crates/rustc_utils/src/mir/location_or_arg.rs

@@ -42,22 +42,15 @@ impl From<Local> for LocationOrArg {
 
 #[cfg(feature = "indexical")]
 pub mod index {
-  use indexical::{
-    impls::RustcIndexSet, index_vec::define_index_type, IndexedDomain, IndexedValue,
-    ToIndex,
-  };
+  use indexical::{bitset::rustc::IndexSet, define_index_type, IndexedDomain, ToIndex};
 
   use super::*;
 
   define_index_type! {
-    pub struct LocationOrArgIndex = u32;
+    pub struct LocationOrArgIndex for LocationOrArg = u32;
   }
 
-  impl IndexedValue for LocationOrArg {
-    type Index = LocationOrArgIndex;
-  }
-
-  pub type LocationOrArgSet = RustcIndexSet<LocationOrArg>;
+  pub type LocationOrArgSet = IndexSet<LocationOrArg>;
   pub type LocationOrArgDomain = IndexedDomain<LocationOrArg>;
 
   pub struct CustomMarker;