diff options
| author | Michael Howell <michael@notriddle.com> | 2022-06-18 08:54:00 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2022-07-09 09:49:05 -0700 |
| commit | 271bad9b08ec51cfd9236359b9fe6234e7fe4d48 (patch) | |
| tree | db66f22fed72d4bc8b37901f4446f6b3bf84cf05 | |
| parent | b8844f2811c98707f8cddb9b1205511c6fdc33e7 (diff) | |
| download | rust-271bad9b08ec51cfd9236359b9fe6234e7fe4d48.tar.gz rust-271bad9b08ec51cfd9236359b9fe6234e7fe4d48.zip | |
Update submodule rust-installer
This includes the following pull requests: * https://github.com/rust-lang/rust-installer/pull/114 * https://github.com/rust-lang/rust-installer/pull/113
| -rw-r--r-- | Cargo.lock | 13 | ||||
| -rw-r--r-- | src/bootstrap/tool.rs | 2 | ||||
| m--------- | src/tools/rust-installer | 0 |
3 files changed, 4 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9cc2b829fb1..a8a95e5d3f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -585,7 +585,6 @@ dependencies = [ "textwrap 0.11.0", "unicode-width", "vec_map", - "yaml-rust 0.3.5", ] [[package]] @@ -1242,7 +1241,7 @@ name = "expand-yaml-anchors" version = "0.1.0" dependencies = [ "yaml-merge-keys", - "yaml-rust 0.4.4", + "yaml-rust", ] [[package]] @@ -1862,7 +1861,7 @@ name = "installer" version = "0.0.0" dependencies = [ "anyhow", - "clap 2.34.0", + "clap 3.1.1", "flate2", "lazy_static", "num_cpus", @@ -5892,17 +5891,11 @@ checksum = "fd236a7dc9bb598f349fe4a8754f49181fee50284daa15cd1ba652d722280004" dependencies = [ "lazy_static", "thiserror", - "yaml-rust 0.4.4", + "yaml-rust", ] [[package]] name = "yaml-rust" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" - -[[package]] -name = "yaml-rust" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 23832b6c43e..f659ccbe250 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -367,7 +367,7 @@ bootstrap_tool!( Compiletest, "src/tools/compiletest", "compiletest", is_unstable_tool = 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; + RustInstaller, "src/tools/rust-installer", "rust-installer", is_external_tool = true; RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes"; ExpandYamlAnchors, "src/tools/expand-yaml-anchors", "expand-yaml-anchors"; LintDocs, "src/tools/lint-docs", "lint-docs"; diff --git a/src/tools/rust-installer b/src/tools/rust-installer -Subproject 5254dbfd25d5284728ab624dca1969d61427a0d +Subproject 300b5ec61ef38855a07e6bb4955a37aa1c414c0 |