rustc_data_structures::fx -> rustc_hash

Author: willcrichton

crates/rustc_utils/src/cache.rs

@@ -60,7 +60,7 @@
 //!     can introduces non-determinism in your program.
 use std::{cell::RefCell, hash::Hash, pin::Pin};
 
-use rustc_data_structures::fx::FxHashMap as HashMap;
+use rustc_hash::FxHashMap as HashMap;
 
 /// Cache for non-copyable types.
 pub struct Cache<In, Out>(RefCell<HashMap<In, Option<Pin<Box<Out>>>>>);
@@ -208,7 +208,7 @@ mod test {
       }
     }
 
-    let cache = RecursiveUse(Default::default());
+    let cache = RecursiveUse(Cache::default());
 
     assert_eq!(cache.get_infinite_recursion(60), 42);
     assert_eq!(cache.get_safe_recursion(5), 15);

crates/rustc_utils/src/hir/ty.rs

@@ -64,11 +64,11 @@ mod test {
 
   #[test]
   fn test_ty_ext() {
-    let input = r#"
+    let input = r"
 fn main() {
   let x = &mut 0;
   let y = 0;
-}"#;
+}";
 
     test_utils::compile_body(input, |tcx, _, body| {
       let body = &body.body;

crates/rustc_utils/src/lib.rs

@@ -46,6 +46,7 @@ extern crate rustc_data_structures;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_graphviz;
+extern crate rustc_hash;
 extern crate rustc_hir;
 extern crate rustc_index;
 extern crate rustc_infer;
@@ -89,7 +90,7 @@ macro_rules! hashset {
   ($($key:expr),*) => {
       {
           let _cap = hashset!(@count $($key),*);
-          let mut _set = ::rustc_data_structures::fx::FxHashSet::default();
+          let mut _set = ::rustc_hash::FxHashSet::default();
           let _ = _set.try_reserve(_cap);
           $(
               let _ = _set.insert($key);

crates/rustc_utils/src/mir/body.rs

@@ -8,7 +8,7 @@ use std::{
 
 use anyhow::{ensure, Result};
 use pretty::PrettyPrintMirOptions;
-use rustc_data_structures::fx::FxHashMap as HashMap;
+use rustc_hash::FxHashMap as HashMap;
 use rustc_hir::{def_id::DefId, CoroutineDesugaring, CoroutineKind, HirId};
 use rustc_middle::{
   mir::{
@@ -205,14 +205,14 @@ mod test {
 
   #[test]
   fn test_body_ext() {
-    let input = r#"
-    fn foobar<'a>(x: &'a i32, y: &'a i32) -> &'a i32 {
-      if *x > 0 {
-        return x;
-      }
-
-      y
-    }"#;
+    let input = r"
+fn foobar<'a>(x: &'a i32, y: &'a i32) -> &'a i32 {
+  if *x > 0 {
+    return x;
+  }
+
+  y
+}";
 
     test_utils::compile_body(input, |_, _, body| {
       let body = &body.body;

crates/rustc_utils/src/mir/borrowck_facts.rs

@@ -3,7 +3,7 @@
 use std::sync::atomic::{AtomicBool, Ordering};
 
 use rustc_borrowck::consumers::{BodyWithBorrowckFacts, ConsumerOptions};
-use rustc_data_structures::fx::FxHashSet as HashSet;
+use rustc_hash::FxHashSet as HashSet;
 use rustc_hir::def_id::LocalDefId;
 use rustc_middle::{
   mir::{Body, BorrowCheckResult, StatementKind, TerminatorKind},

crates/rustc_utils/src/mir/control_dependencies.rs

@@ -202,22 +202,22 @@ impl<Node: Idx + Ord> ControlDependencies<Node> {
 #[cfg(test)]
 mod test {
   use log::debug;
-  use rustc_data_structures::fx::{FxHashMap as HashMap, FxHashSet as HashSet};
+  use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet};
   use rustc_middle::mir::Location;
   use test_log::test;
 
   use crate::{test_utils, BodyExt};
 
   #[test]
   fn test_control_dependencies() {
-    let input = r#"
-    fn main() {
-      let mut x = 1;
-      x = 2;
-      if true { x = 3; }
-      for _ in 0 .. 1 { x = 4; }
-      x = 5;
-    }"#;
+    let input = r"
+fn main() {
+  let mut x = 1;
+  x = 2;
+  if true { x = 3; }
+  for _ in 0 .. 1 { x = 4; }
+  x = 5;
+}";
     test_utils::compile_body(input, move |tcx, _, body_with_facts| {
       let body = &body_with_facts.body;
       let control_deps = body.control_dependencies();

crates/rustc_utils/src/mir/place.rs

@@ -3,7 +3,7 @@
 use std::{borrow::Cow, collections::VecDeque};
 
 use log::{trace, warn};
-use rustc_data_structures::fx::{FxHashMap as HashMap, FxHashSet as HashSet};
+use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet};
 use rustc_hir::def_id::DefId;
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::{
@@ -649,15 +649,15 @@ mod test {
 
   #[test]
   fn test_place_arg_direct() {
-    let input = r#"
+    let input = r"
 fn foobar(x: &i32) {
   let y = 1;
   let z = &y;
   let k = Box::new(*x);
   let ref_k = &k;
   let box_ref = Box::new(x);
 }
-"#;
+";
     test_utils::compile_body(input, |tcx, _, body_with_facts| {
       let body = &body_with_facts.body;
       let name_map = body.debug_info_name_map();
@@ -706,16 +706,15 @@ fn foobar(x: &i32) {
 
   #[test]
   fn test_place_to_string() {
-    let input = r#"
+    let input = r"
 struct Point { x: usize, y: usize }
 fn main() {
   let x = (0, 0);
   let y = Some(1);
   let z = &[Some((0, 1))];
   let w = (&y,);
   let p = &Point { x: 0, y: 0 };
-}
-    "#;
+}";
     test_utils::compile_body(input, |tcx, _, body_with_facts| {
       let body = &body_with_facts.body;
       let p = Placer::new(tcx, body);
@@ -753,12 +752,12 @@ fn main() {
 
   #[test]
   fn test_place_visitors() {
-    let input = r#"
+    let input = r"
 fn main() {
   let x = 0;
   let y = (0, &x);
 }
-    "#;
+";
     fn callback<'tcx>(
       tcx: TyCtxt<'tcx>,
       body_id: BodyId,

crates/rustc_utils/src/source_map/find_bodies.rs

@@ -74,7 +74,7 @@ mod test {
 
   #[test]
   fn test_find_bodies() {
-    let input = r#"
+    let input = r"
 // Ignore constants
 const C: usize = 0;
 
@@ -91,7 +91,7 @@ macro_rules! m {
 
 // Ignore macro-generated bodies
 m!{}
-"#;
+";
     test_utils::CompileBuilder::new(input).compile(|CompileResult { tcx }| {
       assert_eq!(find_bodies(tcx).len(), 3);
     });

crates/rustc_utils/src/source_map/range.rs

@@ -4,7 +4,8 @@ use std::{
 };
 
 use anyhow::{bail, ensure, Context, Result};
-use rustc_data_structures::{fx::FxHashMap as HashMap, sync::Lrc};
+use rustc_data_structures::sync::Lrc;
+use rustc_hash::FxHashMap as HashMap;
 use rustc_hir::{
   intravisit::{self, Visitor},
   BodyId,

crates/rustc_utils/src/source_map/spanner/mod.rs

@@ -232,7 +232,7 @@ impl<'tcx> Spanner<'tcx> {
 
 #[cfg(test)]
 mod test {
-  use rustc_data_structures::fx::FxHashSet as HashSet;
+  use rustc_hash::FxHashSet as HashSet;
   use rustc_middle::mir::BasicBlock;
   use test_log::test;
 
@@ -284,7 +284,7 @@ mod test {
         &["w.0"],
         &["w.0"],
       ];
-      for (input_span, desired) in spans.into_iter().zip(expected.into_iter()) {
+      for (input_span, desired) in spans.into_iter().zip(expected) {
         let outputs = spanner.span_to_places(input_span);
         let snippets = outputs
           .into_iter()
@@ -298,8 +298,8 @@ mod test {
   }
 
   fn compare_sets(desired: &HashSet<impl AsRef<str>>, actual: &HashSet<impl AsRef<str>>) {
-    let desired = desired.iter().map(|s| s.as_ref()).collect::<HashSet<_>>();
-    let actual = actual.iter().map(|s| s.as_ref()).collect::<HashSet<_>>();
+    let desired = desired.iter().map(AsRef::as_ref).collect::<HashSet<_>>();
+    let actual = actual.iter().map(AsRef::as_ref).collect::<HashSet<_>>();
     let missing_desired = &desired - &actual;
     let missing_actual = &actual - &desired;
 
@@ -315,7 +315,7 @@ mod test {
 
   #[test]
   fn test_location_to_spans() {
-    let src = r#"fn foo() {
+    let src = r"fn foo() {
   let mut x: i32 = 1;
   let y = x + 2;
   let w = if true {
@@ -329,7 +329,7 @@ mod test {
   let q = x
     .leading_ones()
     .trailing_zeros();
-}"#;
+}";
 
     // This affects source mapping, and this feature is primarily used by Flowistry, so
     // we enable MIR simplification for consistency with Flowistry.