diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-03-22 19:31:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 19:31:22 +0100 |
| commit | adbfcea58f89dee842519d4ef0cbaefe09fac3a5 (patch) | |
| tree | 6123a4cd668c3da6365df7ac8ccf90f2142740f2 /src | |
| parent | 225b6baae78a4342e713f9afdd31d2eccf6d63b8 (diff) | |
| parent | 9ee3a4041eca0cfca015b82143b44b2f0d3b4a69 (diff) | |
| download | rust-adbfcea58f89dee842519d4ef0cbaefe09fac3a5.tar.gz rust-adbfcea58f89dee842519d4ef0cbaefe09fac3a5.zip | |
Rollup merge of #59236 - mati865:miri-preview, r=oli-obk
Rename miri component to miri-preview It should fix installation via `rustup` and indicates it's not stable yet.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 706fce262f0..3c360a81ba5 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -390,7 +390,7 @@ impl Builder { package("rust-src", &["*"]); package("rls-preview", HOSTS); package("clippy-preview", HOSTS); - package("miri", HOSTS); + package("miri-preview", HOSTS); package("rustfmt-preview", HOSTS); package("rust-analysis", TARGETS); package("llvm-tools-preview", TARGETS); @@ -408,7 +408,7 @@ impl Builder { "rustc", "cargo", "rust-std", "rust-mingw", "rust-docs", "rustfmt-preview", "clippy-preview", "rls-preview", "rust-src", "llvm-tools-preview", - "lldb-preview", "rust-analysis", "miri" + "lldb-preview", "rust-analysis", "miri-preview" ]); } @@ -420,6 +420,7 @@ impl Builder { rename("rls", "rls-preview"); rename("rustfmt", "rustfmt-preview"); rename("clippy", "clippy-preview"); + rename("miri", "miri-preview"); } fn rust_package(&mut self, manifest: &Manifest) -> Package { @@ -468,7 +469,7 @@ impl Builder { // but might be marked as unavailable if they weren't built. extensions.extend(vec![ host_component("clippy-preview"), - host_component("miri"), + host_component("miri-preview"), host_component("rls-preview"), host_component("rustfmt-preview"), host_component("llvm-tools-preview"), |