Use IndexSet from indexmap::IndexSet and revert bootstrap changes

Author: Jamesbarford

Cargo.lock

@@ -4892,9 +4892,9 @@ dependencies = [
 name = "rustc_type_ir_macros"
 version = "0.0.0"
 dependencies = [
+ "indexmap",
  "proc-macro2",
  "quote",
- "rustc_data_structures",
  "syn",
  "synstructure",
 ]

compiler/rustc_type_ir_macros/Cargo.toml

@@ -11,9 +11,9 @@ nightly = []
 
 [dependencies]
 # tidy-alphabetical-start
+indexmap = "2.4.0"
 proc-macro2 = "1"
 quote = "1"
-rustc_data_structures = { path = "../rustc_data_structures" }
 syn = { version = "2.0.9", features = ["full", "visit-mut"] }
 synstructure = "0.13.0"
 # tidy-alphabetical-end

compiler/rustc_type_ir_macros/src/lib.rs

@@ -1,5 +1,5 @@
+use indexmap::IndexSet;
 use quote::{ToTokens, quote};
-use rustc_data_structures::indexmap::IndexSet;
 use syn::visit_mut::VisitMut;
 use syn::{Attribute, parse_quote};
 use synstructure::decl_derive;

src/bootstrap/src/utils/proc_macro_deps.rs

@@ -5,37 +5,26 @@ pub static CRATES: &[&str] = &[
     // tidy-alphabetical-start
     "allocator-api2",
     "anyhow",
-    "arrayvec",
     "askama_derive",
     "askama_parser",
     "basic-toml",
     "bitflags",
     "block-buffer",
     "bumpalo",
-    "cc",
     "cfg-if",
     "cpufeatures",
-    "crossbeam-deque",
-    "crossbeam-epoch",
-    "crossbeam-utils",
     "crypto-common",
     "darling",
     "darling_core",
     "derive_builder_core",
     "digest",
-    "either",
-    "elsa",
-    "ena",
     "equivalent",
-    "errno",
-    "fastrand",
     "fluent-bundle",
     "fluent-langneg",
     "fluent-syntax",
     "fnv",
     "foldhash",
     "generic-array",
-    "getrandom",
     "glob",
     "hashbrown",
     "heck",
@@ -45,70 +34,34 @@ pub static CRATES: &[&str] = &[
     "intl-memoizer",
     "intl_pluralrules",
     "itoa",
-    "jobserver",
     "leb128fmt",
     "libc",
-    "linux-raw-sys",
-    "lock_api",
     "log",
-    "measureme",
     "memchr",
-    "memmap2",
     "minimal-lexical",
     "nom",
-    "once_cell",
-    "parking_lot",
-    "parking_lot_core",
-    "perf-event-open-sys",
     "pest",
     "pest_generator",
     "pest_meta",
-    "pin-project-lite",
-    "portable-atomic",
-    "ppv-lite86",
     "prettyplease",
     "proc-macro2",
-    "psm",
     "quote",
-    "r-efi",
-    "rand",
-    "rand_chacha",
-    "rand_core",
-    "rand_xorshift",
-    "redox_syscall",
     "rustc-hash",
-    "rustc-stable-hash",
-    "rustc_arena",
-    "rustc_data_structures",
-    "rustc_graphviz",
-    "rustc_hashes",
-    "rustc_index",
-    "rustc_serialize",
-    "rustc_thread_pool",
-    "rustix",
     "ryu",
-    "scoped-tls",
-    "scopeguard",
     "self_cell",
     "semver",
     "serde",
     "serde_core",
     "serde_derive_internals",
     "serde_json",
     "sha2",
-    "shlex",
     "smallvec",
     "stable_deref_trait",
-    "stacker",
     "strsim",
     "syn",
     "synstructure",
-    "tempfile",
-    "thin-vec",
     "thiserror",
     "tinystr",
-    "tracing",
-    "tracing-core",
     "type-map",
     "typenum",
     "ucd-trie",
@@ -117,41 +70,18 @@ pub static CRATES: &[&str] = &[
     "unic-langid-macros",
     "unicode-ident",
     "unicode-xid",
-    "valuable",
     "version_check",
-    "wasi",
     "wasm-bindgen-macro-support",
     "wasm-bindgen-shared",
     "wasm-encoder",
     "wasm-metadata",
     "wasmparser",
-    "windows",
-    "windows-collections",
-    "windows-core",
-    "windows-future",
-    "windows-link",
-    "windows-numerics",
-    "windows-result",
-    "windows-strings",
-    "windows-sys",
-    "windows-targets",
-    "windows-threading",
-    "windows_aarch64_gnullvm",
-    "windows_aarch64_msvc",
-    "windows_i686_gnu",
-    "windows_i686_gnullvm",
-    "windows_i686_msvc",
-    "windows_x86_64_gnu",
-    "windows_x86_64_gnullvm",
-    "windows_x86_64_msvc",
     "winnow",
     "wit-bindgen-core",
-    "wit-bindgen-rt",
     "wit-bindgen-rust",
     "wit-component",
     "wit-parser",
     "yoke",
-    "zerocopy",
     "zerofrom",
     "zerovec",
     // tidy-alphabetical-end