From 7b362bb84178b9c87b2b9246b7d3d107820e932a Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 28 May 2019 11:56:05 -0700 Subject: [PATCH] Fixup style --- src/bootstrap/builder.rs | 7 ++++++- src/bootstrap/install.rs | 27 +++++++++++++++++++-------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 56fba94d4c910..a007cbff06411 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -588,7 +588,12 @@ impl<'a> Builder<'a> { /// sysroot. /// /// See `force_use_stage1` for documentation on what each argument is. - pub fn compiler_for(&self, stage: u32, host: Interned, target: Interned) -> Compiler { + pub fn compiler_for( + &self, + stage: u32, + host: Interned, + target: Interned, + ) -> Compiler { if self.build.force_use_stage1(Compiler { stage, host }, target) { self.compiler(1, self.config.build) } else { diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index f4da02c007f31..0047be4d5951b 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -210,15 +210,21 @@ install!((self, builder, _config), Self::should_install(builder) { install_rls(builder, self.compiler.stage, self.target); } else { - builder.info(&format!("skipping Install RLS stage{} ({})", self.compiler.stage, self.target)); + builder.info( + &format!("skipping Install RLS stage{} ({})", self.compiler.stage, self.target), + ); } }; Clippy, "clippy", Self::should_build(_config), only_hosts: true, { - if builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target }).is_some() || - Self::should_install(builder) { + if builder.ensure(dist::Clippy { + compiler: self.compiler, + target: self.target, + }).is_some() || Self::should_install(builder) { install_clippy(builder, self.compiler.stage, self.target); } else { - builder.info(&format!("skipping Install clippy stage{} ({})", self.compiler.stage, self.target)); + builder.info( + &format!("skipping Install clippy stage{} ({})", self.compiler.stage, self.target), + ); } }; Miri, "miri", Self::should_build(_config), only_hosts: true, { @@ -226,16 +232,21 @@ install!((self, builder, _config), Self::should_install(builder) { install_miri(builder, self.compiler.stage, self.target); } else { - builder.info(&format!("skipping Install miri stage{} ({})", self.compiler.stage, self.target)); + builder.info( + &format!("skipping Install miri stage{} ({})", self.compiler.stage, self.target), + ); } }; Rustfmt, "rustfmt", Self::should_build(_config), only_hosts: true, { - if builder.ensure(dist::Rustfmt { compiler: self.compiler, target: self.target }).is_some() || - Self::should_install(builder) { + if builder.ensure(dist::Rustfmt { + compiler: self.compiler, + target: self.target + }).is_some() || Self::should_install(builder) { install_rustfmt(builder, self.compiler.stage, self.target); } else { builder.info( - &format!("skipping Install Rustfmt stage{} ({})", self.compiler.stage, self.target)); + &format!("skipping Install Rustfmt stage{} ({})", self.compiler.stage, self.target), + ); } }; Analysis, "analysis", Self::should_build(_config), only_hosts: false, {