diff options
| author | Michael Goulet <michael@errs.io> | 2023-07-03 15:22:00 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-07-03 21:40:04 +0000 |
| commit | c6fcbaae0f11f3f7d7827f946e8ca9a44c1da3ef (patch) | |
| tree | 60b4e1406d600f264deaa318e0ee33c61bc22187 | |
| parent | 810fbf086d30521617faf8cdb3b6f175c6809766 (diff) | |
| download | rust-c6fcbaae0f11f3f7d7827f946e8ca9a44c1da3ef.tar.gz rust-c6fcbaae0f11f3f7d7827f946e8ca9a44c1da3ef.zip | |
Remove compare mode
| -rw-r--r-- | src/bootstrap/flags.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/common.rs | 1 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 4 | ||||
| -rw-r--r-- | tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs | 1 | ||||
| -rw-r--r-- | tests/ui/impl-trait/issue-55872-3.rs | 1 | ||||
| -rw-r--r-- | tests/ui/impl-trait/issues/issue-65581.rs | 1 |
7 files changed, 1 insertions, 12 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs index dc05f47ee9c..a882336c3c4 100644 --- a/src/bootstrap/flags.rs +++ b/src/bootstrap/flags.rs @@ -304,7 +304,7 @@ pub enum Subcommand { ./x.py test library/std --test-args hash_map ./x.py test library/std --stage 0 --no-doc ./x.py test tests/ui --bless - ./x.py test tests/ui --compare-mode chalk + ./x.py test tests/ui --compare-mode next-solver Note that `test tests/* --stage N` does NOT depend on `build compiler/rustc --stage N`; just like `build library/std --stage N` it tests the compiler produced by the previous stage. diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index c95a125c737..7c17e92d0df 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -107,7 +107,6 @@ string_enum! { #[derive(Clone, Debug, PartialEq)] pub enum CompareMode { Polonius => "polonius", - Chalk => "chalk", NextSolver => "next-solver", NextSolverCoherence => "next-solver-coherence", SplitDwarf => "split-dwarf", diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index fddfbac78d5..e8d0ebd40b0 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2435,9 +2435,6 @@ impl<'test> TestCx<'test> { Some(CompareMode::Polonius) => { rustc.args(&["-Zpolonius"]); } - Some(CompareMode::Chalk) => { - rustc.args(&["-Ztrait-solver=chalk"]); - } Some(CompareMode::NextSolver) => { rustc.args(&["-Ztrait-solver=next"]); } diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index a70ffc3e798..1f6c0b75a09 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -122,10 +122,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "byteorder", // via ruzstd in object in thorin-dwp "cc", "cfg-if", - "chalk-derive", - "chalk-engine", - "chalk-ir", - "chalk-solve", "compiler_builtins", "convert_case", // dependency of derive_more "cpufeatures", diff --git a/tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs b/tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs index 6dfd7f6840f..0d019b1f502 100644 --- a/tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs +++ b/tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs @@ -1,4 +1,3 @@ -// ignore-compare-mode-chalk // check-pass #![feature(type_alias_impl_trait)] use std::fmt::Debug; diff --git a/tests/ui/impl-trait/issue-55872-3.rs b/tests/ui/impl-trait/issue-55872-3.rs index d031271ac08..7490a130800 100644 --- a/tests/ui/impl-trait/issue-55872-3.rs +++ b/tests/ui/impl-trait/issue-55872-3.rs @@ -1,5 +1,4 @@ // edition:2018 -// ignore-compare-mode-chalk #![feature(impl_trait_in_assoc_type)] diff --git a/tests/ui/impl-trait/issues/issue-65581.rs b/tests/ui/impl-trait/issues/issue-65581.rs index b947fc1d239..af65b79d3e8 100644 --- a/tests/ui/impl-trait/issues/issue-65581.rs +++ b/tests/ui/impl-trait/issues/issue-65581.rs @@ -1,5 +1,4 @@ // check-pass -// ignore-compare-mode-chalk #![allow(dead_code)] |