mirror of https://github.com/rust-lang/rust.git
Remove compare mode
This commit is contained in:
parent
810fbf086d
commit
c6fcbaae0f
|
@ -304,7 +304,7 @@ pub enum Subcommand {
|
||||||
./x.py test library/std --test-args hash_map
|
./x.py test library/std --test-args hash_map
|
||||||
./x.py test library/std --stage 0 --no-doc
|
./x.py test library/std --stage 0 --no-doc
|
||||||
./x.py test tests/ui --bless
|
./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`;
|
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
|
just like `build library/std --stage N` it tests the compiler produced by the previous
|
||||||
stage.
|
stage.
|
||||||
|
|
|
@ -107,7 +107,6 @@ string_enum! {
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
pub enum CompareMode {
|
pub enum CompareMode {
|
||||||
Polonius => "polonius",
|
Polonius => "polonius",
|
||||||
Chalk => "chalk",
|
|
||||||
NextSolver => "next-solver",
|
NextSolver => "next-solver",
|
||||||
NextSolverCoherence => "next-solver-coherence",
|
NextSolverCoherence => "next-solver-coherence",
|
||||||
SplitDwarf => "split-dwarf",
|
SplitDwarf => "split-dwarf",
|
||||||
|
|
|
@ -2435,9 +2435,6 @@ impl<'test> TestCx<'test> {
|
||||||
Some(CompareMode::Polonius) => {
|
Some(CompareMode::Polonius) => {
|
||||||
rustc.args(&["-Zpolonius"]);
|
rustc.args(&["-Zpolonius"]);
|
||||||
}
|
}
|
||||||
Some(CompareMode::Chalk) => {
|
|
||||||
rustc.args(&["-Ztrait-solver=chalk"]);
|
|
||||||
}
|
|
||||||
Some(CompareMode::NextSolver) => {
|
Some(CompareMode::NextSolver) => {
|
||||||
rustc.args(&["-Ztrait-solver=next"]);
|
rustc.args(&["-Ztrait-solver=next"]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -122,10 +122,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
|
||||||
"byteorder", // via ruzstd in object in thorin-dwp
|
"byteorder", // via ruzstd in object in thorin-dwp
|
||||||
"cc",
|
"cc",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"chalk-derive",
|
|
||||||
"chalk-engine",
|
|
||||||
"chalk-ir",
|
|
||||||
"chalk-solve",
|
|
||||||
"compiler_builtins",
|
"compiler_builtins",
|
||||||
"convert_case", // dependency of derive_more
|
"convert_case", // dependency of derive_more
|
||||||
"cpufeatures",
|
"cpufeatures",
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
// ignore-compare-mode-chalk
|
|
||||||
// check-pass
|
// check-pass
|
||||||
#![feature(type_alias_impl_trait)]
|
#![feature(type_alias_impl_trait)]
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
// edition:2018
|
// edition:2018
|
||||||
// ignore-compare-mode-chalk
|
|
||||||
|
|
||||||
#![feature(impl_trait_in_assoc_type)]
|
#![feature(impl_trait_in_assoc_type)]
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
// check-pass
|
// check-pass
|
||||||
// ignore-compare-mode-chalk
|
|
||||||
|
|
||||||
#![allow(dead_code)]
|
#![allow(dead_code)]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue