diff options
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 11 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/versions.rs | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 726275988e0..f09e1e5718e 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -365,12 +365,11 @@ impl Builder { let mut rename = |from: &str, to: &str| { manifest.renames.insert(from.to_owned(), Rename { to: to.to_owned() }) }; - rename("rls", "rls-preview"); - rename("rustfmt", "rustfmt-preview"); - rename("clippy", "clippy-preview"); - rename("miri", "miri-preview"); - rename("rust-docs-json", "rust-docs-json-preview"); - rename("rust-analyzer", "rust-analyzer-preview"); + for pkg in PkgType::all() { + if pkg.is_preview() { + rename(pkg.tarball_component_name(), &pkg.manifest_component_name()); + } + } } fn rust_package(&mut self, manifest: &Manifest) -> Package { diff --git a/src/tools/build-manifest/src/versions.rs b/src/tools/build-manifest/src/versions.rs index 5aef232d7ab..967433a86ad 100644 --- a/src/tools/build-manifest/src/versions.rs +++ b/src/tools/build-manifest/src/versions.rs @@ -17,7 +17,7 @@ macro_rules! pkg_type { } impl PkgType { - fn is_preview(&self) -> bool { + pub(crate) fn is_preview(&self) -> bool { match self { $( $( $($is_preview)? PkgType::$variant => true, )? )+ _ => false, @@ -32,7 +32,7 @@ macro_rules! pkg_type { } /// First part of the tarball name. - fn tarball_component_name(&self) -> &str { + pub(crate) fn tarball_component_name(&self) -> &str { match self { $( PkgType::$variant => $component,)+ PkgType::Other(component) => component, |