squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

review changes

Browse source
This commit is contained in:
Nick Cameron 2017-11-13 10:46:46 +13:00
parent 63d854acf2
commit 97d21e29df
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/dist.rs
View file

@ -1161,7 +1161,7 @@ impl Step for Rustfmt {
// Prepare the image directory
// We expect RLS to build, because we've exited this step above if tool
// state for RLS isn't testing.
let rustfmt = builder.ensure(tool::Rls {
let rustfmt = builder.ensure(tool::Rustfmt {
compiler: builder.compiler(stage, build.build),
target
}).expect("Rustfmt to build: toolstate is testing");

4
src/tools/build-manifest/src/main.rs
View file

@ -280,10 +280,6 @@ impl Builder {
if rls_present {
manifest.renames.insert("rls".to_owned(), Rename { to: "rls-preview".to_owned() });
}
if rustfmt_present {
manifest.renames.insert("rustfmt".to_owned(),
Rename { to: "rustfmt-preview".to_owned() });
}
let mut pkg = Package {
version: self.cached_version("rust")