Skip to content

Commit c6fcbaa

Browse files
Remove compare mode
1 parent 810fbf0 commit c6fcbaa

File tree

7 files changed

+1
-12
lines changed

7 files changed

+1
-12
lines changed

src/bootstrap/flags.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ pub enum Subcommand {
304304
./x.py test library/std --test-args hash_map
305305
./x.py test library/std --stage 0 --no-doc
306306
./x.py test tests/ui --bless
307-
./x.py test tests/ui --compare-mode chalk
307+
./x.py test tests/ui --compare-mode next-solver
308308
Note that `test tests/* --stage N` does NOT depend on `build compiler/rustc --stage N`;
309309
just like `build library/std --stage N` it tests the compiler produced by the previous
310310
stage.

src/tools/compiletest/src/common.rs

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ string_enum! {
107107
#[derive(Clone, Debug, PartialEq)]
108108
pub enum CompareMode {
109109
Polonius => "polonius",
110-
Chalk => "chalk",
111110
NextSolver => "next-solver",
112111
NextSolverCoherence => "next-solver-coherence",
113112
SplitDwarf => "split-dwarf",

src/tools/compiletest/src/runtest.rs

-3
Original file line numberDiff line numberDiff line change
@@ -2435,9 +2435,6 @@ impl<'test> TestCx<'test> {
24352435
Some(CompareMode::Polonius) => {
24362436
rustc.args(&["-Zpolonius"]);
24372437
}
2438-
Some(CompareMode::Chalk) => {
2439-
rustc.args(&["-Ztrait-solver=chalk"]);
2440-
}
24412438
Some(CompareMode::NextSolver) => {
24422439
rustc.args(&["-Ztrait-solver=next"]);
24432440
}

src/tools/tidy/src/deps.rs

-4
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
122122
"byteorder", // via ruzstd in object in thorin-dwp
123123
"cc",
124124
"cfg-if",
125-
"chalk-derive",
126-
"chalk-engine",
127-
"chalk-ir",
128-
"chalk-solve",
129125
"compiler_builtins",
130126
"convert_case", // dependency of derive_more
131127
"cpufeatures",

tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// ignore-compare-mode-chalk
21
// check-pass
32
#![feature(type_alias_impl_trait)]
43
use std::fmt::Debug;

tests/ui/impl-trait/issue-55872-3.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// edition:2018
2-
// ignore-compare-mode-chalk
32

43
#![feature(impl_trait_in_assoc_type)]
54

tests/ui/impl-trait/issues/issue-65581.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// check-pass
2-
// ignore-compare-mode-chalk
32

43
#![allow(dead_code)]
54

0 commit comments

Comments
 (0)