Skip to content

Commit

Permalink
Rollup merge of rust-lang#59236 - mati865:miri-preview, r=oli-obk
Browse files Browse the repository at this point in the history
Rename miri component to miri-preview

It should fix installation via `rustup` and indicates it's not stable yet.
  • Loading branch information
Centril authored Mar 22, 2019
2 parents 225b6ba + 9ee3a40 commit adbfcea
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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"
]);
}

Expand All @@ -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 {
Expand Down Expand Up @@ -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"),
Expand Down

0 comments on commit adbfcea

Please sign in to comment.