Skip to content

Commit

Permalink
Rollup merge of rust-lang#112291 - sigaloid:master, r=clubby789
Browse files Browse the repository at this point in the history
Disable RustAnalyzer check by default, run Rustfmt check before

Fixes rust-lang#112287.
  • Loading branch information
GuillaumeGomez committed Jun 5, 2023
2 parents 200d03a + 7ed7e20 commit 0258a16
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -703,8 +703,8 @@ impl<'a> Builder<'a> {
check::CargoMiri,
check::MiroptTestTools,
check::Rls,
check::RustAnalyzer,
check::Rustfmt,
check::RustAnalyzer,
check::Bootstrap
),
Kind::Test => describe!(
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ pub struct RustAnalyzer {
impl Step for RustAnalyzer {
type Output = ();
const ONLY_HOSTS: bool = true;
const DEFAULT: bool = true;
const DEFAULT: bool = false;

fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("src/tools/rust-analyzer")
Expand Down

0 comments on commit 0258a16

Please sign in to comment.