Download rustc component for rustfmt toolchain as well

diff --git a/compiler/rustc_const_eval/src/interpret/intern.rs b/compiler/rustc_const_eval/src/interpret/intern.rs
index 54528b1dbf4a0e252fe90929b9c1945ae43ca3a5..301bfcef78a5512009e6b6f134ece534e34ab85c 100644 (file)
--- a/compiler/rustc_const_eval/src/interpret/intern.rs
+++ b/compiler/rustc_const_eval/src/interpret/intern.rs
@@ -30,15 +30,15 @@
 use crate::const_eval;
 
 pub trait CompileTimeMachine<'mir, 'tcx, T> = Machine<
-    'mir,
-    'tcx,
-    MemoryKind = T,
-    Provenance = AllocId,
-    ExtraFnVal = !,
-    FrameExtra = (),
-    AllocExtra = (),
-    MemoryMap = FxIndexMap<AllocId, (MemoryKind<T>, Allocation)>,
->;
+        'mir,
+        'tcx,
+        MemoryKind = T,
+        Provenance = AllocId,
+        ExtraFnVal = !,
+        FrameExtra = (),
+        AllocExtra = (),
+        MemoryMap = FxIndexMap<AllocId, (MemoryKind<T>, Allocation)>,
+    >;
 
 struct InternVisitor<'rt, 'mir, 'tcx, M: CompileTimeMachine<'mir, 'tcx, const_eval::MemoryKind>> {
     /// The ectx from which we intern.

diff --git a/compiler/rustc_data_structures/src/obligation_forest/mod.rs b/compiler/rustc_data_structures/src/obligation_forest/mod.rs
index 10e673cd9297bda67fddcec349af9f5657a7eaf5..a7130abd73142bf4fb1063669e40ffdb354d9eea 100644 (file)
--- a/compiler/rustc_data_structures/src/obligation_forest/mod.rs
+++ b/compiler/rustc_data_structures/src/obligation_forest/mod.rs
@@ -95,10 +95,7 @@ pub trait ForestObligation: Clone + Debug {
 pub trait ObligationProcessor {
     type Obligation: ForestObligation;
     type Error: Debug;
-    type OUT: OutcomeTrait<
-        Obligation = Self::Obligation,
-        Error = Error<Self::Obligation, Self::Error>,
-    >;
+    type OUT: OutcomeTrait<Obligation = Self::Obligation, Error = Error<Self::Obligation, Self::Error>>;
 
     fn needs_process_obligation(&self, obligation: &Self::Obligation) -> bool;
 

diff --git a/src/bootstrap/download.rs b/src/bootstrap/download.rs
index 6ae283f32a5f3a9080edd104a4cf46bc01b3376d..1be7c6777a791efc11d4c2ffa98aee146bb4ec54 100644 (file)
--- a/src/bootstrap/download.rs
+++ b/src/bootstrap/download.rs
@@ -318,15 +318,27 @@ pub(crate) fn maybe_download_rustfmt(&self) -> Option<PathBuf> {
         let channel = format!("{version}-{date}");
 
         let host = self.build;
-        let rustfmt_path = self.initial_rustc.with_file_name(exe("rustfmt", host));
-        let bin_root = self.out.join(host.triple).join("stage0");
+        let bin_root = self.out.join(host.triple).join("rustfmt");
+        let rustfmt_path = bin_root.join("bin").join(exe("rustfmt", host));
         let rustfmt_stamp = bin_root.join(".rustfmt-stamp");
         if rustfmt_path.exists() && !program_out_of_date(&rustfmt_stamp, &channel) {
             return Some(rustfmt_path);
         }
 
-        let filename = format!("rustfmt-{version}-{build}.tar.xz", build = host.triple);
-        self.download_component(DownloadSource::Dist, filename, "rustfmt-preview", &date, "stage0");
+        self.download_component(
+            DownloadSource::Dist,
+            format!("rustfmt-{version}-{build}.tar.xz", build = host.triple),
+            "rustfmt-preview",
+            &date,
+            "rustfmt",
+        );
+        self.download_component(
+            DownloadSource::Dist,
+            format!("rustc-{version}-{build}.tar.xz", build = host.triple),
+            "rustc",
+            &date,
+            "rustfmt",
+        );
 
         self.fix_bin_or_dylib(&bin_root.join("bin").join("rustfmt"));
         self.fix_bin_or_dylib(&bin_root.join("bin").join("cargo-fmt"));

diff --git a/src/stage0.json b/src/stage0.json
index ee104b06f8a34157dbef489660e451c91e2d4ae3..46f70b1ef4b09ea2315f1a286ba03c636ecf93a2 100644 (file)
--- a/src/stage0.json
+++ b/src/stage0.json
@@ -21,64 +21,10 @@
     "version": "beta"
   },
   "rustfmt": {
-    "date": "2023-01-24",
+    "date": "2023-01-30",
     "version": "nightly"
   },
   "checksums_sha256": {
-    "dist/2023-01-24/rustfmt-nightly-aarch64-apple-darwin.tar.gz": "dbfbc33fe90a67ee39e8c1ecf3015405c5cc6a3fd93ae3b004c54861b488b09b",
-    "dist/2023-01-24/rustfmt-nightly-aarch64-apple-darwin.tar.xz": "aca5cdb50aeacacbdaefc126c5f2236d4658939f18d1cadd68f120af7b4c3ecb",
-    "dist/2023-01-24/rustfmt-nightly-aarch64-pc-windows-msvc.tar.gz": "97b4f42d93dc10bb7f4a967f013be88a3c507815decdd93a2ea954b75b189cf0",
-    "dist/2023-01-24/rustfmt-nightly-aarch64-pc-windows-msvc.tar.xz": "25615f274ceef21054d081914244051d00322003ec40cf0c467abccd1037d8b4",
-    "dist/2023-01-24/rustfmt-nightly-aarch64-unknown-linux-gnu.tar.gz": "02ab0d565707f2399326526ed66e197a8d919c66a0f21c7c3f95c840ac20244e",
-    "dist/2023-01-24/rustfmt-nightly-aarch64-unknown-linux-gnu.tar.xz": "5f148006e087e7105b88cdb64f80e27b3c4d27c08944217ef889add6185f067d",
-    "dist/2023-01-24/rustfmt-nightly-aarch64-unknown-linux-musl.tar.gz": "8291ee3a006d8ba932fb9cdd0449f2caf690190ed87cf9ff81c32da510ce6b70",
-    "dist/2023-01-24/rustfmt-nightly-aarch64-unknown-linux-musl.tar.xz": "760aee321753c993c861292a014994193abfe1da85b91124d9c583646836d156",
-    "dist/2023-01-24/rustfmt-nightly-arm-unknown-linux-gnueabi.tar.gz": "a3c8935265ef05f1e4a14ff22f4f4d57c6aa44816a6ca55a48af9c5449b3ae84",
-    "dist/2023-01-24/rustfmt-nightly-arm-unknown-linux-gnueabi.tar.xz": "5cddc0649e59498fc887cbb9150ee16b55c8a72eb4f67a7e09b37a0ebfa30046",
-    "dist/2023-01-24/rustfmt-nightly-arm-unknown-linux-gnueabihf.tar.gz": "77b21f570054ef92c8e1b7d28d43e40064c97fd97e01e7ed6bc23c35e20786b7",
-    "dist/2023-01-24/rustfmt-nightly-arm-unknown-linux-gnueabihf.tar.xz": "b027d1a6a46631b1dcc5e62466b7a459443c4d2b01e7781e3a7a5520d3f79ece",
-    "dist/2023-01-24/rustfmt-nightly-armv7-unknown-linux-gnueabihf.tar.gz": "cea014c2983692ca40f8e5d9e8fd2fbbe6d3f44a6ebcd554ce6c75316aa55e4f",
-    "dist/2023-01-24/rustfmt-nightly-armv7-unknown-linux-gnueabihf.tar.xz": "bf3ad7d15b9b3c2a1db9c81c359e09a61bdc92932c6cef83073f886fdf138c38",
-    "dist/2023-01-24/rustfmt-nightly-i686-pc-windows-gnu.tar.gz": "13789d43a9552e490e7e90c23d6046245b5f858abde9aceb2038b1ed51530879",
-    "dist/2023-01-24/rustfmt-nightly-i686-pc-windows-gnu.tar.xz": "b1de4837aaf4dfcfde9eda904c5c2a506bbf45439c52740a1d465a5cf223bc07",
-    "dist/2023-01-24/rustfmt-nightly-i686-pc-windows-msvc.tar.gz": "7202987c56395d7742b1403866bc6d3f2fe844e77efc9b1abcff102ad7db8091",
-    "dist/2023-01-24/rustfmt-nightly-i686-pc-windows-msvc.tar.xz": "6cd740234171c3164bb2ee296d7afe02702d6dc1d75d49fbbd0e43a1c875aad9",
-    "dist/2023-01-24/rustfmt-nightly-i686-unknown-linux-gnu.tar.gz": "07c19deb3f3de9e6a149577fac37cecbefbb7db2a8ad27ec374fa4b04f9d7226",
-    "dist/2023-01-24/rustfmt-nightly-i686-unknown-linux-gnu.tar.xz": "1501bf589a2ece8d4cb70bcd582b5d0a7999140b2d2d6c56613f16c70831814c",
-    "dist/2023-01-24/rustfmt-nightly-mips-unknown-linux-gnu.tar.gz": "74bad9753ceb342fa11ec5fdcc78e97b0088587cbea8ade63a9d21d78a2b2722",
-    "dist/2023-01-24/rustfmt-nightly-mips-unknown-linux-gnu.tar.xz": "0c89c8f2a533db51d0d55dd783451a423de473eb9b0dd092a6e70cbf1424afc9",
-    "dist/2023-01-24/rustfmt-nightly-mips64-unknown-linux-gnuabi64.tar.gz": "b06d454a4d4e77c4e6e33a05cf74e7fbfc5c5cfe9f29a8340564bce7cfc9107c",
-    "dist/2023-01-24/rustfmt-nightly-mips64-unknown-linux-gnuabi64.tar.xz": "f3ff52f12ab81631a769431f6c815b70fc252087685a53d6718f67f49abcbc35",
-    "dist/2023-01-24/rustfmt-nightly-mips64el-unknown-linux-gnuabi64.tar.gz": "669ffedfc4db61034e8352f1359e135851b771a4ead0a2a4b2e2523305e0347c",
-    "dist/2023-01-24/rustfmt-nightly-mips64el-unknown-linux-gnuabi64.tar.xz": "8f079d3d4e508618291715db2181b1516edbd084909d727e5a15538ee4b7b24f",
-    "dist/2023-01-24/rustfmt-nightly-mipsel-unknown-linux-gnu.tar.gz": "9f12607d844249fcb89f0e879ce2c7f7eed3bec7213a01d4c7f156e2d0109564",
-    "dist/2023-01-24/rustfmt-nightly-mipsel-unknown-linux-gnu.tar.xz": "c65cfe59919178b4431f37d997d5e6e4af00d0ecdde50b7b9432a71e08aa79b3",
-    "dist/2023-01-24/rustfmt-nightly-powerpc-unknown-linux-gnu.tar.gz": "ed7866cbfde12692438554f445a475fe3ded60210adffd34778e200e22730f36",
-    "dist/2023-01-24/rustfmt-nightly-powerpc-unknown-linux-gnu.tar.xz": "8b082eeb39e67f1a9d601f4749b90a8f37f21026502595ca99f9ba6c8f00b510",
-    "dist/2023-01-24/rustfmt-nightly-powerpc64-unknown-linux-gnu.tar.gz": "02cdc38571616260749e04dc44f01e122d5388f682ec5ecde18d555bbf681c9b",
-    "dist/2023-01-24/rustfmt-nightly-powerpc64-unknown-linux-gnu.tar.xz": "ce72390e2116bd8ff4d1cf77e0ff760048464ab647e6d21d669a8e451e16c2fa",
-    "dist/2023-01-24/rustfmt-nightly-powerpc64le-unknown-linux-gnu.tar.gz": "3ce12078c57df56569f2e6c13b24c6cbcae411a60a0ea386ccc514f1a4d05bf9",
-    "dist/2023-01-24/rustfmt-nightly-powerpc64le-unknown-linux-gnu.tar.xz": "36a34f7fadaf3d5f6ab191a47de698b5574065b1b86b53668a6475ca7628a892",
-    "dist/2023-01-24/rustfmt-nightly-riscv64gc-unknown-linux-gnu.tar.gz": "a6c6a5596f06fe1f7119d0befc208d646caa2be2841b219b6717c6c7f52d209e",
-    "dist/2023-01-24/rustfmt-nightly-riscv64gc-unknown-linux-gnu.tar.xz": "248f4b77dbb659134f019c3819108c46c2d3a5d1c37ded7152fa6a86ee938e3c",
-    "dist/2023-01-24/rustfmt-nightly-s390x-unknown-linux-gnu.tar.gz": "da830d46e75cc7c795d722f0b52595031740c60c063bebae3921fc5bcb8691ee",
-    "dist/2023-01-24/rustfmt-nightly-s390x-unknown-linux-gnu.tar.xz": "5ca4d5c1f36950682903fa02d3f1a07fe6117eae0d2987743fdd835178bd1eb3",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-apple-darwin.tar.gz": "9ac34c02e7fc80964d02815fff239c67abddd4de216fec4a43c7ece10c239228",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-apple-darwin.tar.xz": "e63033c3ecc08347bd14ae25e497f8471419d6f110358d2993d4f24b9d5c35bb",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-pc-windows-gnu.tar.gz": "ebd8db08c806ccf805428f454578ed52124a4a989be85a3c83a5f249af6109e4",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-pc-windows-gnu.tar.xz": "c9c1779798b5412d66dc4cee0ecb15fd168862b150ed1ce0486d0c56258e34ff",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-pc-windows-msvc.tar.gz": "3c55a8ea07044d7894e1a584ae216676fb26a83de41a1ad9fbfecf5a7ef3c317",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-pc-windows-msvc.tar.xz": "b5be35b6b20b7f0a72c76fa6d76c55b16dfd86461018a623ccd289d0836523d5",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-freebsd.tar.gz": "9763003f2f0790cb379c238c73ca26a9683d6034f7aec1dacfc72a601e398271",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-freebsd.tar.xz": "8f7073076408d5880ec326ad673a5c33e023a2f1ddc92affa8cbf3aa2d2f1274",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-illumos.tar.gz": "d667651444a2fc3a87d3b5c427d35c1b2629f4c14d319c73e54c3efccd0f18ba",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-illumos.tar.xz": "8a57c358861edde8a1a59139609525c999f596034a3271661bb7eb573306e347",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.gz": "b56c7533697f3db80901d9012c4dedb7599d9d3f8489730d64e19d857552ff3d",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "0233142bb789b2a1cfa7f746cbd6d3f074c2a9c9925b9bac5def9a53bc6b6f55",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-linux-musl.tar.gz": "51978f029470ddbb5915bf6f4ca68d104f3b9ca36a3584ea14824c51e43afee6",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-linux-musl.tar.xz": "d27c5768be94e48ff37d56e41b67b81c909e7764f0d753089f4627864bb31bc9",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-netbsd.tar.gz": "6aa26a4bad451860941074576e2b56bb39cd033194b3d75df5a9c55745ec16aa",
-    "dist/2023-01-24/rustfmt-nightly-x86_64-unknown-netbsd.tar.xz": "0c6fe51cb3de9af84deea4cafb9e1734b4d5f7d62be42a36b85408e655ae3504",
     "dist/2023-01-25/cargo-beta-aarch64-apple-darwin.tar.gz": "323f3c4c41892765b24201aae83a54fcaef08e47b9b2912a2680528c6ed4f8f8",
     "dist/2023-01-25/cargo-beta-aarch64-apple-darwin.tar.xz": "2039157d9100ccadf4d3596f5d7b052e10ff997b59ac7619999969794fc51eae",
     "dist/2023-01-25/cargo-beta-aarch64-pc-windows-msvc.tar.gz": "ac3c88c99aed8d4547f8b0f857ec3538456f10223411580278eed10f6e2be30b",
@@ -366,6 +312,114 @@
     "dist/2023-01-25/rustc-beta-x86_64-unknown-linux-musl.tar.gz": "a649445f1676acafc59b4808211aa669c9fb8093cabb7007432d0ae2f6e21239",
     "dist/2023-01-25/rustc-beta-x86_64-unknown-linux-musl.tar.xz": "b6ed06a8df0de6b64099fba4d1ca9478e0802dfc086308f425692ee40faa8d2a",
     "dist/2023-01-25/rustc-beta-x86_64-unknown-netbsd.tar.gz": "d939bd071f42aa7657297110be68dd9d2aad840272bf881a1fdc82053914f970",
-    "dist/2023-01-25/rustc-beta-x86_64-unknown-netbsd.tar.xz": "5671084575291d8c4ef2ed0930b22815d6810e2378fb98ca5a0738faa76b525b"
+    "dist/2023-01-25/rustc-beta-x86_64-unknown-netbsd.tar.xz": "5671084575291d8c4ef2ed0930b22815d6810e2378fb98ca5a0738faa76b525b",
+    "dist/2023-01-30/rustc-nightly-aarch64-apple-darwin.tar.gz": "f634a282a8388aff57d988616f17f2c511253a02d45193b03fa87167448a8cd9",
+    "dist/2023-01-30/rustc-nightly-aarch64-apple-darwin.tar.xz": "4fd6a4ec8665ba71ccf3ac7d08f9010b4e130ce496bc62548d36170786f213ab",
+    "dist/2023-01-30/rustc-nightly-aarch64-pc-windows-msvc.tar.gz": "5b7fc325745b2f1e22b1a58ead8163314c3ec06f4a30483bf7ddfb57f811a2d4",
+    "dist/2023-01-30/rustc-nightly-aarch64-pc-windows-msvc.tar.xz": "4aa8d587ebd53bbd11c33f263991328576977d801d5b6eccf56147301ea0f52e",
+    "dist/2023-01-30/rustc-nightly-aarch64-unknown-linux-gnu.tar.gz": "7838bf7da92539b0329be0b9b80f0738df3617e982f539326a6a99892eb905f1",
+    "dist/2023-01-30/rustc-nightly-aarch64-unknown-linux-gnu.tar.xz": "636af094f94de9baa3edd5f9e1b7655e0bb7f6f23d24d6f389a3abeab7360e00",
+    "dist/2023-01-30/rustc-nightly-aarch64-unknown-linux-musl.tar.gz": "51b8a8a06244ee37d2c37e84154ff87132b4f90a1e62a8c9454ed5ea5c296c1f",
+    "dist/2023-01-30/rustc-nightly-aarch64-unknown-linux-musl.tar.xz": "cc18ce5f4f461a830c725ca8ddccda17bd726374198c487810eab8d36a8f7c98",
+    "dist/2023-01-30/rustc-nightly-arm-unknown-linux-gnueabi.tar.gz": "e2d7b96bf5e2feb47019c63067dbb1627bf26ac4e730774d29ea9f6967edae3a",
+    "dist/2023-01-30/rustc-nightly-arm-unknown-linux-gnueabi.tar.xz": "0483f07f1a53949c2f04e2766f53fe9138ce126059f650ac61215e6a84c5fd57",
+    "dist/2023-01-30/rustc-nightly-arm-unknown-linux-gnueabihf.tar.gz": "d3ad417041c432438f1ed56a2324ab412dca7631a74da03e0bc72cd28e69f197",
+    "dist/2023-01-30/rustc-nightly-arm-unknown-linux-gnueabihf.tar.xz": "f029fafa0635efec9065d76780f003e2c4220c7b6ea4b426ebcb57d943403998",
+    "dist/2023-01-30/rustc-nightly-armv7-unknown-linux-gnueabihf.tar.gz": "dd2ee13ccea00c23ca2f90872c7c31a3a1ef008962db9cf8066acc130bca778f",
+    "dist/2023-01-30/rustc-nightly-armv7-unknown-linux-gnueabihf.tar.xz": "dc23fa4c0268a7227e0f9e4941376ffc4c64c0614622f442da10dbb75e014dd4",
+    "dist/2023-01-30/rustc-nightly-i686-pc-windows-gnu.tar.gz": "d4b02e59373fe60ba06e979f784bf1b8c94ca4a5ee471ed83814623db9e14af6",
+    "dist/2023-01-30/rustc-nightly-i686-pc-windows-gnu.tar.xz": "5355e1bfdddd2a56dd0c882fc492e4d571e5b29636d381e848102e996ca9b680",
+    "dist/2023-01-30/rustc-nightly-i686-pc-windows-msvc.tar.gz": "02a43fb72394837461770c1b472afb534ac03bac9cf23bfdbba8227cf879dabe",
+    "dist/2023-01-30/rustc-nightly-i686-pc-windows-msvc.tar.xz": "78cbe74bd0f7029b01e3aeb451ea6bbc1656db1fb4a80caac4cc27b6e0144b79",
+    "dist/2023-01-30/rustc-nightly-i686-unknown-linux-gnu.tar.gz": "7fa9a3e3d70a6c15bfd00a0b5a83d73f4e952862b8ef1d6837d3598c4cee8752",
+    "dist/2023-01-30/rustc-nightly-i686-unknown-linux-gnu.tar.xz": "76b3abe5c532785ab80804461204280e6d853773c62956f283f5dc88130e310c",
+    "dist/2023-01-30/rustc-nightly-mips-unknown-linux-gnu.tar.gz": "2aa78ea99fceb90e568f6c46881623f5088afeaf47ba204abf2ef755397e84eb",
+    "dist/2023-01-30/rustc-nightly-mips-unknown-linux-gnu.tar.xz": "6abe1f28662aca904b1fd91e46e0441ba7b4f66f1e7757cab93a0d73012b36fc",
+    "dist/2023-01-30/rustc-nightly-mips64-unknown-linux-gnuabi64.tar.gz": "3afadbbe1b073ee2a81609c87c3d88a5d7344765b970b8c48dcdfe539c5ba540",
+    "dist/2023-01-30/rustc-nightly-mips64-unknown-linux-gnuabi64.tar.xz": "f1eb22696c376dfea266090320e7a941986f8de2176b6ceb6dc0f0452994ae4a",
+    "dist/2023-01-30/rustc-nightly-mips64el-unknown-linux-gnuabi64.tar.gz": "c7f548350e118d4281a8a6ac8044c19eb1583683490b0ea6fb9f5f27f5e3873a",
+    "dist/2023-01-30/rustc-nightly-mips64el-unknown-linux-gnuabi64.tar.xz": "aad40926a20ac8bda9e534d63e180adfa355e9df22a1068310cf9ae667ffd0ad",
+    "dist/2023-01-30/rustc-nightly-mipsel-unknown-linux-gnu.tar.gz": "4778f49dceea661baaf641531946dda47d8ddb7f801cc63afbec37a86d45a0f4",
+    "dist/2023-01-30/rustc-nightly-mipsel-unknown-linux-gnu.tar.xz": "1ba09bcefaf5ed5a3029230ebc3e9cad33626b38553451b952ef215c68a98e34",
+    "dist/2023-01-30/rustc-nightly-powerpc-unknown-linux-gnu.tar.gz": "6efe1f619ad49c94b3e6fef2a51893cec88ecacf31d963576e6343e8a050d20d",
+    "dist/2023-01-30/rustc-nightly-powerpc-unknown-linux-gnu.tar.xz": "971fdc824861c98bf223fb2c733e780cf87c90f3a5646561f4e35fa8cd068c7c",
+    "dist/2023-01-30/rustc-nightly-powerpc64-unknown-linux-gnu.tar.gz": "10741ef62e00541a85747db16f830c71ffa1dce036a95bc43df433e450f96602",
+    "dist/2023-01-30/rustc-nightly-powerpc64-unknown-linux-gnu.tar.xz": "b8bc80ee97c54e428c51f56e30cdd610fb07f41bead0409b089fe56237bb0421",
+    "dist/2023-01-30/rustc-nightly-powerpc64le-unknown-linux-gnu.tar.gz": "f8f52abf57943895d34ffe2157f863bbdabaf804969baa2624e38a13648d43de",
+    "dist/2023-01-30/rustc-nightly-powerpc64le-unknown-linux-gnu.tar.xz": "7dfb9af100df05b558c873b5440c532d28de44fbf8c7d933c29481eef6693539",
+    "dist/2023-01-30/rustc-nightly-riscv64gc-unknown-linux-gnu.tar.gz": "9454d78432ce8ad61f8cfbe448654d8acddda9c596c36c7863631c638aba949f",
+    "dist/2023-01-30/rustc-nightly-riscv64gc-unknown-linux-gnu.tar.xz": "c69f1b0062aaf566d6610e6b19335ed002a281aa65b34c1be001a875b85f76d2",
+    "dist/2023-01-30/rustc-nightly-s390x-unknown-linux-gnu.tar.gz": "92184254f00348bfaa7f40f8a07b585eeb6dabc02e4dff3351cb395b354a930a",
+    "dist/2023-01-30/rustc-nightly-s390x-unknown-linux-gnu.tar.xz": "b41eff99cf9b9851ffbf496ba6dc892d5dfd124da68c91db66d6fb77b19370d4",
+    "dist/2023-01-30/rustc-nightly-x86_64-apple-darwin.tar.gz": "8d901d7c2ed293a9e2d2fb8849edee50e6f6e3c5a049fa91cfb13f8f16571b7e",
+    "dist/2023-01-30/rustc-nightly-x86_64-apple-darwin.tar.xz": "d472dc97f3242d243f584efe113f23e62ac1f53677fb3b3cd1749adb65a6635c",
+    "dist/2023-01-30/rustc-nightly-x86_64-pc-windows-gnu.tar.gz": "9259adfb75f90cd43c99f253aaf4b242afe941c4075eabc6bce824c3337b4d2e",
+    "dist/2023-01-30/rustc-nightly-x86_64-pc-windows-gnu.tar.xz": "e42b3e9a462004296e53ed3e71403caff98b3718ff15508d913e0a25ad02ea3d",
+    "dist/2023-01-30/rustc-nightly-x86_64-pc-windows-msvc.tar.gz": "82f615142be1fed6ffd5c9a6f2d1d3fb73ebf32801348cf6279991c0a76b771c",
+    "dist/2023-01-30/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "2a4e2aad343062379334ee1a73b657656e0c03f0490c901806c864ea8a38ebe1",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-freebsd.tar.gz": "2a8fa3a6a104bd35de9a83d98786e7acb7614e0b830336adda30e8d1f1cade69",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-freebsd.tar.xz": "37327a8b756918c25cb799f2e5742a07145e4c1e424442a5d975e99aff1f303d",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-illumos.tar.gz": "8be0295e8b89b6e8f465b0825b0625232c7624cb897efe3e0bf4da222799349c",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-illumos.tar.xz": "8e515082490a64d83771131f4fa5fba8b021d205b56149459e2f2da7584407e3",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-linux-gnu.tar.gz": "c105e3dabdc7bebebadc6ffa5b6f3f962057948cdac6647cd5adf16d66982701",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "09b82ca24ff847e000aed1b2eaca74cdf0f6e533bd6655eaa302281eb7037163",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-linux-musl.tar.gz": "e77d81b158b53a94065cd90f68e26dd12d156084b02c53c51172e02c4db58c1c",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-linux-musl.tar.xz": "613c7eab1b998aec0673e1781e3ed78c4d038b449d879c11254b1b6d4345e34c",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-netbsd.tar.gz": "ac8c53be048049118af9fd9d356dcc69ddfaafcd52020ea93703c94d6167b367",
+    "dist/2023-01-30/rustc-nightly-x86_64-unknown-netbsd.tar.xz": "28b1c8adfffa7863bcd8a46ef407044d06fc16b29f7b6f42072fcbfbdc779e79",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-apple-darwin.tar.gz": "f7e585d9016a012e2cde4d7e0899e52e1c410c53ed9caf6db22d13f6791ffb0f",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-apple-darwin.tar.xz": "bdea28e1700f34dc0a6e57db5f73caf6c8d1671a8356cc51096f8155f58690c8",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-pc-windows-msvc.tar.gz": "e9988193283871e678a0d0e08cfb5bdab37d43cb0bec0e5f63a12a38c164936b",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-pc-windows-msvc.tar.xz": "30d1bad2b730589f9d75ca3e2d410d0f9c90707526ed6a66edac92a19eb3716c",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-unknown-linux-gnu.tar.gz": "7c6c93fa25193360e28a90269439b28465b6693b6ce68ff2eb1c4209c36a9d60",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-unknown-linux-gnu.tar.xz": "4c8331d14ab428b922135690b433f97acd37291e1801635252ab5da849d42180",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-unknown-linux-musl.tar.gz": "0fb5372bf4cc0b6388194021dc7b6a539bd413e89058c05cdc42c1dfe8d92edc",
+    "dist/2023-01-30/rustfmt-nightly-aarch64-unknown-linux-musl.tar.xz": "0e2452ff037698781157c30c5fd67f552e897feb1d86b7b074c195c70a6a1a3a",
+    "dist/2023-01-30/rustfmt-nightly-arm-unknown-linux-gnueabi.tar.gz": "6c079c2dde918cf2d9f029dfb3a2a9bebba2504dfe97c5fdc0ef79022415b9f0",
+    "dist/2023-01-30/rustfmt-nightly-arm-unknown-linux-gnueabi.tar.xz": "5ab6fa16d7aaca7e6e36caea8e11b916c089dccb511f79b7f69bba667edabc50",
+    "dist/2023-01-30/rustfmt-nightly-arm-unknown-linux-gnueabihf.tar.gz": "7b919c9132269fcde24559af58d3d2fee56d93308d731d891f89dcee193bbbdb",
+    "dist/2023-01-30/rustfmt-nightly-arm-unknown-linux-gnueabihf.tar.xz": "53d7c7d03b64526e013c11c49519a63f51562f9682039479c377c92529e5e026",
+    "dist/2023-01-30/rustfmt-nightly-armv7-unknown-linux-gnueabihf.tar.gz": "c19265cc3a85cd296a85b450e2f4e4b5f3646aa70d6c70dfdfe9ef222fd72136",
+    "dist/2023-01-30/rustfmt-nightly-armv7-unknown-linux-gnueabihf.tar.xz": "66159d87fd85a4534104da3f7f5c0a14403960ff2c836eb72e35bed6a1ebde32",
+    "dist/2023-01-30/rustfmt-nightly-i686-pc-windows-gnu.tar.gz": "be84f8558d15dcc802f399f44f0de58e93b28e99cf62e38c0d6e6078a8d73102",
+    "dist/2023-01-30/rustfmt-nightly-i686-pc-windows-gnu.tar.xz": "b4e8f18335aa3cba092df29c3aadef79c0b88e00f563604467cb2485e10cced6",
+    "dist/2023-01-30/rustfmt-nightly-i686-pc-windows-msvc.tar.gz": "43ce7581f50e05c775b39a6a6d297d6e8c56a40f5a5817ae4d996d319fbe96c1",
+    "dist/2023-01-30/rustfmt-nightly-i686-pc-windows-msvc.tar.xz": "2ca2b20996f1a4cbdb619393a3f544ada208caaf381748ee997a70139e52a591",
+    "dist/2023-01-30/rustfmt-nightly-i686-unknown-linux-gnu.tar.gz": "229fb281ec100e68445b5a402a3d39a0947475054c4f043d55ab2e33bd3d2a57",
+    "dist/2023-01-30/rustfmt-nightly-i686-unknown-linux-gnu.tar.xz": "65326115afcf1c8e07cfcb9ed294a1e5a136b998557cd60b4cb976520f84cfe1",
+    "dist/2023-01-30/rustfmt-nightly-mips-unknown-linux-gnu.tar.gz": "337bdf61237c8e47909c3f14b5c8fdf3b8b14f2b265e6da45cd6b4d8180d0afd",
+    "dist/2023-01-30/rustfmt-nightly-mips-unknown-linux-gnu.tar.xz": "d683349af8320d6bc9f16021fc8937920d70e99cf668ce64cad962705dd20ea5",
+    "dist/2023-01-30/rustfmt-nightly-mips64-unknown-linux-gnuabi64.tar.gz": "08a1ae9e61ef097c5d5ce83e5d2bdda62e72d07b4dd21aad286413c619fefa1a",
+    "dist/2023-01-30/rustfmt-nightly-mips64-unknown-linux-gnuabi64.tar.xz": "cc3f1f86997c5ccf5607c8f873c916d1158da76ff971d75e36ed8e3a87c86924",
+    "dist/2023-01-30/rustfmt-nightly-mips64el-unknown-linux-gnuabi64.tar.gz": "f4b7084fc67cf17b3cf1d36136aa03aa5b6af188d311684b15395f05104181f6",
+    "dist/2023-01-30/rustfmt-nightly-mips64el-unknown-linux-gnuabi64.tar.xz": "2ab645d5117606f2c7e8decbeae1d8855ec7ba53051144ba4783efee2c58d91d",
+    "dist/2023-01-30/rustfmt-nightly-mipsel-unknown-linux-gnu.tar.gz": "cfa8baa60cc59ac2750f799d33b06eb399d330f318783907717a9e360fd7d85f",
+    "dist/2023-01-30/rustfmt-nightly-mipsel-unknown-linux-gnu.tar.xz": "bf24570425c064aaef31788bbabd6c4938c9323eca2dedf2ac9084d125623544",
+    "dist/2023-01-30/rustfmt-nightly-powerpc-unknown-linux-gnu.tar.gz": "f5437d81735fa67ef24c7b561d1c720395f5d8d4ddcfd88364717a7ed9b96a7d",
+    "dist/2023-01-30/rustfmt-nightly-powerpc-unknown-linux-gnu.tar.xz": "8e19c3c95d6445e1ef9b1735191f0d0bc33802bcfa138a9d676d9b266adab17c",
+    "dist/2023-01-30/rustfmt-nightly-powerpc64-unknown-linux-gnu.tar.gz": "7fd91c2ef7e26c08854c91969d167d1c97538d7678c6ed7914eb0f67290d8d5d",
+    "dist/2023-01-30/rustfmt-nightly-powerpc64-unknown-linux-gnu.tar.xz": "9e8ada358580b396054278972d532ce2044550071036e9da2eab598e2953a03a",
+    "dist/2023-01-30/rustfmt-nightly-powerpc64le-unknown-linux-gnu.tar.gz": "eec8b1c24ccaea22eed7708e61bd32bac0850d0dff2b06f1a15a95ab86385363",
+    "dist/2023-01-30/rustfmt-nightly-powerpc64le-unknown-linux-gnu.tar.xz": "215f1f3bdd8f347af5969c66ff7f7cbf39753ae483e75e689ac581f9d35a64df",
+    "dist/2023-01-30/rustfmt-nightly-riscv64gc-unknown-linux-gnu.tar.gz": "39460814c429b6a57ce72fafa583d04190053f2c2ce995c8bcb0799ecb7f8bd5",
+    "dist/2023-01-30/rustfmt-nightly-riscv64gc-unknown-linux-gnu.tar.xz": "6bd08db8702f2fcd9f4cd19a1d977962c84856f748552a96b564e5a77cf2fdfc",
+    "dist/2023-01-30/rustfmt-nightly-s390x-unknown-linux-gnu.tar.gz": "81d6335fa1265cdf99682503cfb236b914fa17d45f967e456ddbeb12bae2dcbf",
+    "dist/2023-01-30/rustfmt-nightly-s390x-unknown-linux-gnu.tar.xz": "d36b7517efac2c4a34a1055411f779c386c7a566e4eec408dbc8a319f67f5451",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-apple-darwin.tar.gz": "1a34ec058cb45189c4062ad2a00ab33387a54716f75005d9959cf0691d06ae50",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-apple-darwin.tar.xz": "a2fdcb7cc9fe7819699f511d52da0e8ed4e55ba42c63e7b1d61512e4e14e5c29",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-pc-windows-gnu.tar.gz": "95e3f080394d2e4f9916f17c9cf5137d032da847d9ac1c04519b31177fb1618e",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-pc-windows-gnu.tar.xz": "c306895982f92c24559b18f8ff9e011e8722c3310e5f70010fd04b0d044c49bb",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-pc-windows-msvc.tar.gz": "36331cd76f8e918b73ebf6d9095efd0a07cc9f084f194f74c881c14fbc6e8a77",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-pc-windows-msvc.tar.xz": "2e7caa7209e52a9df17254b17f1930afd5ae973826ce3293f29b8b878aa13042",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-freebsd.tar.gz": "dec92f2c27f785f8ae0db18c2e8a9db87e1ae8addb4302f5cbe9f745cd92c4f2",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-freebsd.tar.xz": "a8fef2e56d9d2be9072c17d75e7ac695eb8fc266fc35e1055fbb25757e6db29d",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-illumos.tar.gz": "9b5f93f00f61def125436332e4b709bdfe74c441995bae49c0d482f24bd9f8f1",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-illumos.tar.xz": "4f82313dce2e1315bd0d3ebf95f33bbdf7275c59205b0910bbc92d41c47c7c22",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.gz": "69efa04956d9bcf177a3bd9ba9541fa681b39416a1b7dd2b18415b72311897b9",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "0c3c33d744ec05e96298d0bdb9890654ab9ce3e9013b9af14c78683560456820",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-linux-musl.tar.gz": "cba8b1f086c544d79aa09ac954374f44d5e7d38ad9bbc2f9e84723d0088592e5",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-linux-musl.tar.xz": "ce73d1d03b62931d6eb9508b701e9dacc08b98b484af3daa79ae600c4883a9f4",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-netbsd.tar.gz": "87e1018a3ee4f781b3c1b471fcdf80ebd70096ed58b29db00ad97573626294f4",
+    "dist/2023-01-30/rustfmt-nightly-x86_64-unknown-netbsd.tar.xz": "c6896ee319403ebb5c909b13feabc7411e3aa80523ef1bc84c8aae181514c923"
   }
 }

diff --git a/src/tools/bump-stage0/src/main.rs b/src/tools/bump-stage0/src/main.rs
index 530a80b1ed374523894a2a23c5775f2cf8b9d78d..f530a4d73d36095dae366cf602e195d81b412723 100644 (file)
--- a/src/tools/bump-stage0/src/main.rs
+++ b/src/tools/bump-stage0/src/main.rs
@@ -6,7 +6,7 @@
 
 const PATH: &str = "src/stage0.json";
 const COMPILER_COMPONENTS: &[&str] = &["rustc", "rust-std", "cargo"];
-const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt-preview"];
+const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt-preview", "rustc"];
 
 struct Tool {
     config: Config,