dev-lang/rust: drop 1.34.2

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

3 files changed, 0 insertions, 798 deletions

diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 6db69467871b..89501d818d1e 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,16 +1,3 @@
-DIST rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz 121877852 BLAKE2B accab68c374afe3eafa38e7ad33c32c427db8d0caab722461075c679af2406d991453a8e529a013b99a5841ef9a5e047cdc9ca88dbebab0c904f4afd99c2b851 SHA512 51f6ca909411fd3b3c05baedc38be8a29923966e7cd6960a10152886687132d4ef9750140c5121b9486d6f6ee1ed7ff35f8105c9f0731fe98ce750d0ea9c528f
-DIST rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz 122944304 BLAKE2B c9c29d9409d5829029ffc444c890c0bba0ea213c0a4eb169e65447b6183b0693ab26d48db2fb0be5a325f6ebb7588f90e18b8377f46276d519fcdf5a637ddae7 SHA512 7911dd32cb415d69c05041f450540312d6a78efea36646b4d409a01a0809d94c2eb6a20bfc27772f50cfa0cfed076c3cf5ce62509820819111226f6974f05844
-DIST rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz 123280648 BLAKE2B be19b75623995c0f986d56318887685e70b682caa735adeac259a3f4b67f56537dc43a2a5d696db66547cb523227498c9fcc4213b28df12e5d26999f3caaa7ee SHA512 a0850de543cd11efab4d67bde498e5897f66bbffa1671c4bb6d31fc709dc0869e322e18982dffd199ad6ff7cee282475b04a563fd11a4c7df86f872b02fcce93
-DIST rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz 125019964 BLAKE2B d5d25099719e4ba9bedeb1de89ec3ecb53cbf9d5540de83f723250f5c0130d0a8a7e7a1956cf1581fd709a806b7d42a55dcc94cf9d5e164cd0638a84f65f2f37 SHA512 25a16c576d826115fdac5a55b89bf3372dfb39c563f2ce7d39b0a7a3c9bdc43eaf10974dfa42e26c5aa04aee169ced3e797fa46fa82bd9f4ceddeddaf6687659
-DIST rust-1.33.0-i686-unknown-linux-gnu.tar.xz 168000488 BLAKE2B 62ee1355ddcc09723bd604faba92a602da68768ab741820905b473ff590e1bc7a2bd755db129d04efe9820326bfeb1b5ff54de37188e6b58ef45ec4144c05ada SHA512 f61f97c529232fd6d7587bbf34c41dd9cc334272b1d523464d7b964aba5a102edaff8d387445e3fdb2b9587c1cdd870e97b9572c9421e79ee047479443f1896d
-DIST rust-1.33.0-mips-unknown-linux-gnu.tar.xz 115251736 BLAKE2B 6785896dd969c52c49edb265d2883d48debb0bed77aecbec0a913ec0d7751d747d9a3d5db2b8fdbdec9a9f598bf13a2870987740f79a75042a030d549cb1d7a0 SHA512 17c76e83a6be9813b842909177dbab89abc2ffa4b97c32a45d8e9c0cb69311570d3797932d49b8c26522c812cb9fc86d00a3787a9a413d57140349d75dfd266a
-DIST rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz 123408336 BLAKE2B f45ed3ab2c899bbdfbdbd3f50f3db1aaeb0fab32f1693cd432132d6e5713cbea63876d7e506eba8c25f5f28a946b524438837c9342f7b7cdf446910698136a34 SHA512 40998fe7ea3f40bb39d7a6d2dc16043aaaf0cbd2cda912b6deeb42fe02da480d4a218810610fc6e31686ab89db1da0cddb6b2599e98c3ba6856fef7c0d64bae7
-DIST rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz 117489676 BLAKE2B b35648ede3694707cea887c0856e016ac98c53c8099202c30e819805564fcfa3d43410980980b8b9c977b4cbf97e185a4049311cda67e0dd5443136c6fe43ae0 SHA512 957a16738b3fc37b916593cb2e5a2d503da08bfe9517f3537483fa48781073e9f54eb14f8f9afc3d2e85fcd45ee0eb3fce1dc2680b5667e67520af363eeeb134
-DIST rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz 117067768 BLAKE2B a968d0eaa52edaa3b5f99d11b34b9f24930a1639277a92d5d68cf80007b8f026daabd07c5379fd18a82c904939172a677be6a0baa9c73785b1ee19d7d04fa66a SHA512 8129b248ea55e427d29d8a637081d1744c08368178ca55c5367c485959984d41d093044ced29825194287a5bda3d491148f36c4c16d6efac797bb8c3af9800e7
-DIST rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz 126030216 BLAKE2B b1d1b996b833ebf8e8fb29d1395192a4354cac4d5381a3ac4f7b8338a19b3b49e5bd318268ee6cd075fa7b69d539e8d2dc021eddfda794791cb1a154b7d2b7e8 SHA512 7d53501d20119ba8d9723650800cdbde17e4ed1719f6258c48c25113082e0400d9ac74ca1bfca54722dbb2049f7b5d34177bb613031c1611daa2545e1706c745
-DIST rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz 130922680 BLAKE2B db63d859631703e845efac57074e0f33f80a3b52b2e9dc8707b81892eee8fc922fa5a7d4b7b1f45fb5f19ea4d7f6fde9212f1c6e99e7e4c30dbc02aa87b0df7e SHA512 393c808e93792cf2b126d6111834932a55cbf18339942ac0d20fc4a3692b0ac08c21a3c8fd393795f7aafecac5a2c5d7c9415c18017a7453f759f746045f5144
-DIST rust-1.33.0-s390x-unknown-linux-gnu.tar.xz 134441220 BLAKE2B e6f0a6e54e4e1fde10f54f66615d44442b7cb5eb5bda43d55ee791328c7ecd61505b3d84719df82b7c5c7ae473b7041512f2cf346281518d7d78d0e22112fa05 SHA512 755a0203e2c143386cb3729faada4d2c38b254dfa7e6eeb722ec9847d6319a1d3d289c7b77a2bc478d79dbbabfcd826d8b015acd29fbdf5acb591feae1876205
-DIST rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz 155298128 BLAKE2B af5bc628bc054bd354d5af78e53cd2ffbfbdf2c2d3a3e58eeb593f148c54024fa5905aa53a69c514d6d41e48688697e1ce8adb866817c77cdf541399f6e7956f SHA512 b7f3087f34e99517cd729f5ff1f8cce3f3254cb36c734d5b90d878293e4406934c2f597bf7e2941e9257046f62c9274eb4769a64dabfbc5f0bbf2a1703f7fef8
 DIST rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz 120868188 BLAKE2B d843cce81338b2b3765c973f06dca83161fefed129efefe94efad663b5ddef54aa092bf5977ba7bca74519b008796e60486cf8b193ec2a2dead3add66295d41f SHA512 7103362b8840d094661a16053d8f07eba413c369bf3a2b686313875aa97c30b35697fceefbfc90dffd5cfd4de946e7f848f2b791736443639b30bb75709b7122
 DIST rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz 122563056 BLAKE2B 05e73de7d58723affef3f272e646245a97b17373cc960d5e1be0365919ad3879e08bd9012126e41235b97a758bb57fa4e67fcd11e2f29322af9ab039fc3e2dfd SHA512 d6c055e8ba0fd494797a55d2a6df1eec2a6361c0b081e4b7cb06e42a03a644e4de49c7b17dc8cb6484f3271517f2bd50935bc72ead486531b5b370a1c576b12a
 DIST rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz 122858592 BLAKE2B aebe65fb64044c342f525749eb5d67217f459712aa72d49497062af461901a6e92d21b00e05439bd0753228b876f521198a8b005b116b5121ec3dd812df4bec8 SHA512 5cc2612988182b68d9b220d6d7620fc0b064a9d347825d4677959b7e43820647ff25651427db3a5c72401ab8d0c14e2976921d71ddbe0a5b540cf045241cd727
@@ -89,7 +76,6 @@ DIST rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz 242170220 BLAKE2B 3a5ec3b57c
 DIST rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz 247026740 BLAKE2B 90269aa78eded26c7d54c2e38a08af5f2a5cc3bfb86c268a12050315ba48f232f324b1fcc8e4abae49489cfd9df83edf6d04424ba14fb77f15daea1f6b5c242e SHA512 e15585150370514e580e171faa749218aeef04ce0493f5ad3928a0cb6cd0bddbf7c75ba8ed0783a2c954bbd7166e0445b4c33be4ab48479b0104f032b3d4b0af
 DIST rust-1.39.0-s390x-unknown-linux-gnu.tar.xz 298119784 BLAKE2B 82f64163929c129e2aaee8909401c4f302496f63f8d9d366d6f7460b4546d7657ea38bcd864ecd0f58a5995e47f7f5890e4523dcbcbc51e3bf4085536b07de5f SHA512 d2b588f802d4fbe153dbd88cb745d34d1f5434cb3134cc9e091ebfb336a48b4c886cd80311cf92b5e1c6a16374302853a67e8a0576b02a89dbcf61d27919a045
 DIST rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz 284967620 BLAKE2B c5d2c2a11c4f66105ece51e7ca45ca6a9e0d70215f94ce52f6e61b20995ceb611e45bad1e5e9f33fd444bb0a58a2edb691f1a65a1caf36ad892c034e00104383 SHA512 02ca6c821877379d8bd0bcc38281a87e6f86bdbae1270da19e41336cc3a812d9c11c1e976655c192c39153f92cda90ddbd7b4b0bcb4f6787d6d354d2be827a8a
-DIST rustc-1.34.2-src.tar.xz 95048792 BLAKE2B e81e4bfda87ddfb09ab8a74792346970aa440c678d2bb1279c329db4929282f761ada6fea9d81ceeecfd513613025c8e636487626fc36bd0b33559e045bb1b15 SHA512 f1bd2b226d90aae8a4657e6117b9a8451d4ce8129f79cc0fce0da7613a3b7800e690bc0ede8fec20a2f5f32c13fa8e22ac97d3838e0d36936793535a75d9c381
 DIST rustc-1.35.0-src.tar.xz 96543548 BLAKE2B 0291152f2b7aa8b50b22d74afbd9c7654bab8ae7dcb76224dbff43bc39a3b918ff86bfd20f408a9a16da8b20b08d9f0289bb63620f093d25d9fa008de57f52c3 SHA512 477c10b780bd54776be7ecbda0ab970416253e4a87c3e701825a7d07bcbcd91601b8e61129c5d04d4259e89c2e81e87cdbdee853375a8de5c9cf8372be2c9129
 DIST rustc-1.36.0-src.tar.xz 98707920 BLAKE2B caff82482589941ab63be51eeffdf2a0419c1b624485240a0547b4bebc9f64f6c65a4babb960d1b23b3cde76550390d6d4813e1e9a9c43bf325998c87832fb94 SHA512 1adbb3b67d599f926dc19258e2596cb3b990e152e75e71645637098526207aa5632d7915fd5b67c7a045f63860cc7be3d28be014ad6141a342adc16b2fe8a879
 DIST rustc-1.37.0-src.tar.xz 98654252 BLAKE2B ddee92c7959a0e1ee11ffe5ded6017703cfac7bbf2a00dc46c37ed28f1cd1d31e1d5b62cc1a5ae2d55d64f8705d0cb282f4968deddf36c3152e5e0cfdfbea67d SHA512 bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4
diff --git a/dev-lang/rust/files/1.34.0-doc-build-fix.patch b/dev-lang/rust/files/1.34.0-doc-build-fix.patch
deleted file mode 100644
index 52b8d6ea7f73..000000000000
--- a/dev-lang/rust/files/1.34.0-doc-build-fix.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-From 9efc93c96dd6746460cef916d307b72ba21a7fd0 Mon Sep 17 00:00:00 2001
-From: Mark Rousskov <mark.simulacrum@gmail.com>
-Date: Sun, 3 Mar 2019 09:29:59 -0700
-Subject: [PATCH 1/2] Tools built by the bootstrap compiler must be built by it
-
-This avoids building compilers that we don't need -- most tools will work
-just fine with the downloaded compiler.
----
- src/bootstrap/doc.rs  |   6 ++-
- src/bootstrap/test.rs |  10 ++--
- src/bootstrap/tool.rs | 104 +++++++++++++++++++++++++++---------------
- 3 files changed, 78 insertions(+), 42 deletions(-)
-
-diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index e0ad0422a6ce..621e3a95473e 100644
---- a/src/bootstrap/doc.rs
-+++ b/src/bootstrap/doc.rs
-@@ -883,7 +883,11 @@ impl Step for ErrorIndex {
-         builder.info(&format!("Documenting error index ({})", target));
-         let out = builder.doc_out(target);
-         t!(fs::create_dir_all(&out));
--        let mut index = builder.tool_cmd(Tool::ErrorIndex);
-+        let compiler = builder.compiler(2, builder.config.build);
-+        let mut index = tool::ErrorIndex::command(
-+            builder,
-+            compiler,
-+        );
-         index.arg("html");
-         index.arg(out.join("error-index.html"));
- 
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 51412f79c3d0..5abf9d699784 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -414,7 +414,6 @@ impl Step for Miri {
- 
- #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
- pub struct CompiletestTest {
--    stage: u32,
-     host: Interned<String>,
- }
- 
-@@ -427,16 +426,14 @@ impl Step for CompiletestTest {
- 
-     fn make_run(run: RunConfig<'_>) {
-         run.builder.ensure(CompiletestTest {
--            stage: run.builder.top_stage,
-             host: run.target,
-         });
-     }
- 
-     /// Runs `cargo test` for compiletest.
-     fn run(self, builder: &Builder<'_>) {
--        let stage = self.stage;
-         let host = self.host;
--        let compiler = builder.compiler(stage, host);
-+        let compiler = builder.compiler(0, host);
- 
-         let mut cargo = tool::prepare_tool_cargo(builder,
-                                                  compiler,
-@@ -1426,7 +1423,10 @@ impl Step for ErrorIndex {
-         t!(fs::create_dir_all(&dir));
-         let output = dir.join("error-index.md");
- 
--        let mut tool = builder.tool_cmd(Tool::ErrorIndex);
-+        let mut tool = tool::ErrorIndex::command(
-+            builder,
-+            builder.compiler(compiler.stage, builder.config.build),
-+        );
-         tool.arg("markdown")
-             .arg(&output)
-             .env("CFG_BUILD", &builder.config.build)
-diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index fc1a17d54667..4f2aa0b795dc 100644
---- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -250,9 +250,9 @@ pub fn prepare_tool_cargo(
-     cargo
- }
- 
--macro_rules! tool {
-+macro_rules! bootstrap_tool {
-     ($(
--        $name:ident, $path:expr, $tool_name:expr, $mode:expr
-+        $name:ident, $path:expr, $tool_name:expr
-         $(,llvm_tools = $llvm:expr)*
-         $(,is_external_tool = $external:expr)*
-         ;
-@@ -266,10 +266,7 @@ macro_rules! tool {
- 
-         impl Tool {
-             pub fn get_mode(&self) -> Mode {
--                let mode = match self {
--                    $(Tool::$name => $mode,)+
--                };
--                mode
-+                Mode::ToolBootstrap
-             }
- 
-             /// Whether this tool requires LLVM to run
-@@ -282,27 +279,15 @@ macro_rules! tool {
- 
-         impl<'a> Builder<'a> {
-             pub fn tool_exe(&self, tool: Tool) -> PathBuf {
--                let stage = self.tool_default_stage(tool);
-                 match tool {
-                     $(Tool::$name =>
-                         self.ensure($name {
--                            compiler: self.compiler(stage, self.config.build),
-+                            compiler: self.compiler(0, self.config.build),
-                             target: self.config.build,
-                         }),
-                     )+
-                 }
-             }
--
--            pub fn tool_default_stage(&self, tool: Tool) -> u32 {
--                // Compile the error-index in the same stage as rustdoc to avoid
--                // recompiling rustdoc twice if we can. Otherwise compile
--                // everything else in stage0 as there's no need to rebootstrap
--                // everything.
--                match tool {
--                    Tool::ErrorIndex if self.top_stage >= 2 => self.top_stage,
--                    _ => 0,
--                }
--            }
-         }
- 
-         $(
-@@ -321,7 +306,8 @@ macro_rules! tool {
- 
-             fn make_run(run: RunConfig<'_>) {
-                 run.builder.ensure($name {
--                    compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
-+                    // snapshot compiler
-+                    compiler: run.builder.compiler(0, run.builder.config.build),
-                     target: run.target,
-                 });
-             }
-@@ -331,7 +317,7 @@ macro_rules! tool {
-                     compiler: self.compiler,
-                     target: self.target,
-                     tool: $tool_name,
--                    mode: $mode,
-+                    mode: Mode::ToolBootstrap,
-                     path: $path,
-                     is_optional_tool: false,
-                     source_type: if false $(|| $external)* {
-@@ -347,21 +333,67 @@ macro_rules! tool {
-     }
- }
- 
--tool!(
--    Rustbook, "src/tools/rustbook", "rustbook", Mode::ToolBootstrap;
--    ErrorIndex, "src/tools/error_index_generator", "error_index_generator", Mode::ToolRustc;
--    UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen", Mode::ToolBootstrap;
--    Tidy, "src/tools/tidy", "tidy", Mode::ToolBootstrap;
--    Linkchecker, "src/tools/linkchecker", "linkchecker", Mode::ToolBootstrap;
--    CargoTest, "src/tools/cargotest", "cargotest", Mode::ToolBootstrap;
--    Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap, llvm_tools = true;
--    BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::ToolBootstrap;
--    RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::ToolBootstrap;
--    RustInstaller, "src/tools/rust-installer", "fabricate", Mode::ToolBootstrap,
--        is_external_tool = true;
--    RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes", Mode::ToolBootstrap;
-+bootstrap_tool!(
-+    Rustbook, "src/tools/rustbook", "rustbook";
-+    UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen";
-+    Tidy, "src/tools/tidy", "tidy";
-+    Linkchecker, "src/tools/linkchecker", "linkchecker";
-+    CargoTest, "src/tools/cargotest", "cargotest";
-+    Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true;
-+    BuildManifest, "src/tools/build-manifest", "build-manifest";
-+    RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
-+    RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true;
-+    RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes";
- );
- 
-+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
-+pub struct ErrorIndex {
-+    pub compiler: Compiler,
-+}
-+
-+impl ErrorIndex {
-+    pub fn command(builder: &Builder<'_>, compiler: Compiler) -> Command {
-+        let mut cmd = Command::new(builder.ensure(ErrorIndex {
-+            compiler
-+        }));
-+        add_lib_path(
-+            vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))],
-+            &mut cmd,
-+        );
-+        cmd
-+    }
-+}
-+
-+impl Step for ErrorIndex {
-+    type Output = PathBuf;
-+
-+    fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-+        run.path("src/tools/error_index_generator")
-+    }
-+
-+    fn make_run(run: RunConfig<'_>) {
-+        // Compile the error-index in the same stage as rustdoc to avoid
-+        // recompiling rustdoc twice if we can.
-+        let stage = if run.builder.top_stage >= 2 { run.builder.top_stage } else { 0 };
-+        run.builder.ensure(ErrorIndex {
-+            compiler: run.builder.compiler(stage, run.builder.config.build),
-+        });
-+    }
-+
-+    fn run(self, builder: &Builder<'_>) -> PathBuf {
-+        builder.ensure(ToolBuild {
-+            compiler: self.compiler,
-+            target: self.compiler.host,
-+            tool: "error_index_generator",
-+            mode: Mode::ToolRustc,
-+            path: "src/tools/error_index_generator",
-+            is_optional_tool: false,
-+            source_type: SourceType::InTree,
-+            extra_features: Vec::new(),
-+        }).expect("expected to build -- essential tool")
-+    }
-+}
-+
- #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
- pub struct RemoteTestServer {
-     pub compiler: Compiler,
-@@ -625,7 +657,7 @@ impl<'a> Builder<'a> {
-     /// `host`.
-     pub fn tool_cmd(&self, tool: Tool) -> Command {
-         let mut cmd = Command::new(self.tool_exe(tool));
--        let compiler = self.compiler(self.tool_default_stage(tool), self.config.build);
-+        let compiler = self.compiler(0, self.config.build);
-         self.prepare_tool_cmd(compiler, tool, &mut cmd);
-         cmd
-     }
-@@ -637,7 +669,7 @@ impl<'a> Builder<'a> {
-     fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) {
-         let host = &compiler.host;
-         let mut lib_paths: Vec<PathBuf> = vec![
--            if compiler.stage == 0 && tool != Tool::ErrorIndex {
-+            if compiler.stage == 0 {
-                 self.build.rustc_snapshot_libdir()
-             } else {
-                 PathBuf::from(&self.sysroot_libdir(compiler, compiler.host))
-
-From 03718ed67a7b8fd57fc27316ec57ac3bc0f13d06 Mon Sep 17 00:00:00 2001
-From: Mark Rousskov <mark.simulacrum@gmail.com>
-Date: Sun, 3 Mar 2019 09:50:56 -0700
-Subject: [PATCH 2/2] Permit getting stage 0 rustdoc
-
-This allows us to e.g. test compiletest, including doctests, in stage 0
-without building a fresh compiler and rustdoc.
----
- src/bootstrap/builder.rs | 15 +++++++--------
- src/bootstrap/dist.rs    |  2 +-
- src/bootstrap/doc.rs     |  8 ++++----
- src/bootstrap/test.rs    |  8 ++++----
- src/bootstrap/tool.rs    |  8 +++++---
- 5 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 7e6c0a9f52aa..f8b7f25a7543 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -668,20 +668,19 @@ impl<'a> Builder<'a> {
-             .map(|entry| entry.path())
-     }
- 
--    pub fn rustdoc(&self, host: Interned<String>) -> PathBuf {
--        self.ensure(tool::Rustdoc { host })
-+    pub fn rustdoc(&self, compiler: Compiler) -> PathBuf {
-+        self.ensure(tool::Rustdoc { compiler })
-     }
- 
--    pub fn rustdoc_cmd(&self, host: Interned<String>) -> Command {
-+    pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command {
-         let mut cmd = Command::new(&self.out.join("bootstrap/debug/rustdoc"));
--        let compiler = self.compiler(self.top_stage, host);
-         cmd.env("RUSTC_STAGE", compiler.stage.to_string())
-             .env("RUSTC_SYSROOT", self.sysroot(compiler))
-             // Note that this is *not* the sysroot_libdir because rustdoc must be linked
-             // equivalently to rustc.
-             .env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler))
-             .env("CFG_RELEASE_CHANNEL", &self.config.channel)
--            .env("RUSTDOC_REAL", self.rustdoc(host))
-+            .env("RUSTDOC_REAL", self.rustdoc(compiler))
-             .env("RUSTDOC_CRATE_VERSION", self.rust_version())
-             .env("RUSTC_BOOTSTRAP", "1");
- 
-@@ -689,7 +688,7 @@ impl<'a> Builder<'a> {
-         cmd.env_remove("MAKEFLAGS");
-         cmd.env_remove("MFLAGS");
- 
--        if let Some(linker) = self.linker(host) {
-+        if let Some(linker) = self.linker(compiler.host) {
-             cmd.env("RUSTC_TARGET_LINKER", linker);
-         }
-         cmd
-@@ -751,7 +750,7 @@ impl<'a> Builder<'a> {
-                 // This is the intended out directory for compiler documentation.
-                 my_out = self.compiler_doc_out(target);
-             }
--            let rustdoc = self.rustdoc(compiler.host);
-+            let rustdoc = self.rustdoc(compiler);
-             self.clear_if_dirty(&my_out, &rustdoc);
-         } else if cmd != "test" {
-             match mode {
-@@ -897,7 +896,7 @@ impl<'a> Builder<'a> {
-             .env(
-                 "RUSTDOC_REAL",
-                 if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) {
--                    self.rustdoc(compiler.host)
-+                    self.rustdoc(compiler)
-                 } else {
-                     PathBuf::from("/path/to/nowhere/rustdoc/not/required")
-                 },
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 2dae3f9135d8..3045cda125ee 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -479,7 +479,7 @@ impl Step for Rustc {
-             t!(fs::create_dir_all(image.join("bin")));
-             builder.cp_r(&src.join("bin"), &image.join("bin"));
- 
--            builder.install(&builder.rustdoc(compiler.host), &image.join("bin"), 0o755);
-+            builder.install(&builder.rustdoc(compiler), &image.join("bin"), 0o755);
- 
-             // Copy runtime DLLs needed by the compiler
-             if libdir != "bin" {
-diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index 621e3a95473e..ae329286486d 100644
---- a/src/bootstrap/doc.rs
-+++ b/src/bootstrap/doc.rs
-@@ -335,7 +335,7 @@ fn invoke_rustdoc(
-     let footer = builder.src.join("src/doc/footer.inc");
-     let version_info = out.join("version_info.html");
- 
--    let mut cmd = builder.rustdoc_cmd(compiler.host);
-+    let mut cmd = builder.rustdoc_cmd(compiler);
- 
-     let out = out.join("book");
- 
-@@ -415,7 +415,7 @@ impl Step for Standalone {
-             }
- 
-             let html = out.join(filename).with_extension("html");
--            let rustdoc = builder.rustdoc(compiler.host);
-+            let rustdoc = builder.rustdoc(compiler);
-             if up_to_date(&path, &html) &&
-                up_to_date(&footer, &html) &&
-                up_to_date(&favicon, &html) &&
-@@ -425,7 +425,7 @@ impl Step for Standalone {
-                 continue
-             }
- 
--            let mut cmd = builder.rustdoc_cmd(compiler.host);
-+            let mut cmd = builder.rustdoc_cmd(compiler);
-             cmd.arg("--html-after-content").arg(&footer)
-                .arg("--html-before-content").arg(&version_info)
-                .arg("--html-in-header").arg(&favicon)
-@@ -824,7 +824,7 @@ impl Step for Rustdoc {
-         builder.ensure(Rustc { stage, target });
- 
-         // Build rustdoc.
--        builder.ensure(tool::Rustdoc { host: compiler.host });
-+        builder.ensure(tool::Rustdoc { compiler: compiler });
- 
-         // Symlink compiler docs to the output directory of rustdoc documentation.
-         let out_dir = builder.stage_out(compiler, Mode::ToolRustc)
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 5abf9d699784..6b9960c355c5 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -177,7 +177,7 @@ impl Step for Cargotest {
-             cmd.arg(&builder.initial_cargo)
-                 .arg(&out_dir)
-                 .env("RUSTC", builder.rustc(compiler))
--                .env("RUSTDOC", builder.rustdoc(compiler.host)),
-+                .env("RUSTDOC", builder.rustdoc(compiler)),
-         );
-     }
- }
-@@ -560,7 +560,7 @@ impl Step for RustdocTheme {
-                 builder.sysroot_libdir(self.compiler, self.compiler.host),
-             )
-             .env("CFG_RELEASE_CHANNEL", &builder.config.channel)
--            .env("RUSTDOC_REAL", builder.rustdoc(self.compiler.host))
-+            .env("RUSTDOC_REAL", builder.rustdoc(self.compiler))
-             .env("RUSTDOC_CRATE_VERSION", builder.rust_version())
-             .env("RUSTC_BOOTSTRAP", "1");
-         if let Some(linker) = builder.linker(self.compiler.host) {
-@@ -995,7 +995,7 @@ impl Step for Compiletest {
-             || (mode == "ui" && is_rustdoc_ui)
-         {
-             cmd.arg("--rustdoc-path")
--                .arg(builder.rustdoc(compiler.host));
-+                .arg(builder.rustdoc(compiler));
-         }
- 
-         cmd.arg("--src-base")
-@@ -1451,7 +1451,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
-     }
- 
-     builder.info(&format!("doc tests for: {}", markdown.display()));
--    let mut cmd = builder.rustdoc_cmd(compiler.host);
-+    let mut cmd = builder.rustdoc_cmd(compiler);
-     builder.add_rust_test_threads(&mut cmd);
-     cmd.arg("--test");
-     cmd.arg(markdown);
-diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index 4f2aa0b795dc..5fb83caac06c 100644
---- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -430,7 +430,9 @@ impl Step for RemoteTestServer {
- 
- #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
- pub struct Rustdoc {
--    pub host: Interned<String>,
-+    /// This should only ever be 0 or 2.
-+    /// We sometimes want to reference the "bootstrap" rustdoc, which is why this option is here.
-+    pub compiler: Compiler,
- }
- 
- impl Step for Rustdoc {
-@@ -444,12 +446,12 @@ impl Step for Rustdoc {
- 
-     fn make_run(run: RunConfig<'_>) {
-         run.builder.ensure(Rustdoc {
--            host: run.host,
-+            compiler: run.builder.compiler(run.builder.top_stage, run.host),
-         });
-     }
- 
-     fn run(self, builder: &Builder<'_>) -> PathBuf {
--        let target_compiler = builder.compiler(builder.top_stage, self.host);
-+        let target_compiler = self.compiler;
-         if target_compiler.stage == 0 {
-             if !target_compiler.is_snapshot(builder) {
-                 panic!("rustdoc in stage 0 must be snapshot rustdoc");
diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild
deleted file mode 100644
index 8973490b5aa2..000000000000
--- a/dev-lang/rust/rust-1.34.2.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-		$(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:8[llvm_targets_WebAssembly?]
-	)
-	<sys-devel/llvm-9:=
-"
-LLVM_MAX_SLOT=8
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:=
-	net-misc/curl[ssl]
-	system-llvm? (
-		${LLVM_DEPEND}
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-	!dev-util/cargo
-	rustfmt? ( !dev-util/rustfmt )"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	wasm? ( llvm_targets_WebAssembly )
-	x86? ( cpu_flags_x86_sse2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
-	"${FILESDIR}"/1.34.0-doc-build-fix.patch
-	"${FILESDIR}"/1.34.0-libressl.patch # bug 684224
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="7G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="10G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-	use system-llvm && llvm_pkg_setup
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	# ugly hack for https://bugs.gentoo.org/679806
-	if use ppc64; then
-		sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die
-		export OPENSSL_ppccap=0
-	fi
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	if use wasm; then
-		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-	fi
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		link-shared = $(toml_usex system-llvm)
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)/${P}"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debuginfo = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		channel = "stable"
-		rpath = false
-		lld = $(toml_usex wasm)
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-		if use system-llvm; then
-			cat <<- EOF >> "${S}"/config.toml
-				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-			EOF
-		fi
-	done
-
-	if use wasm; then
-		cat <<- EOF >> "${S}"/config.toml
-			[target.wasm32-unknown-unknown]
-			linker = "rust-lld"
-		EOF
-	fi
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -v --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	local rust_target abi_libdir
-
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || die
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Copy shared library versions of standard libraries for all targets
-	# into the system's abi-dependent lib directories because the rust
-	# installer only does so for the native ABI.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
-			continue
-		fi
-		abi_libdir=$(get_abi_LIBDIR ${v##*.})
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		mkdir -p "${ED}/usr/${abi_libdir}"
-		cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
-		   "${ED}/usr/${abi_libdir}" || die
-	done
-
-	# temp fix for https://bugs.gentoo.org/672816
-	# FIXME: this should handle libdir=lib, not exact arches
-	if { use x86 || use arm; }; then
-		local rust_target wrongdir rightdir
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
-		rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
-		if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
-			einfo "fixing bug #672816"
-			mv "${wrongdir}" "${rightdir}" || die
-			rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
-		fi
-	fi # end temp fix
-
-	dodoc COPYRIGHT
-
-	# FIXME:
-	# Really not sure if that env is needed, specailly LDPATH
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}"
-		MANPATH="${EPREFIX}/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}