about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2023-05-31 01:21:38 +0000
committerMichael Goulet <michael@errs.io>2023-06-06 18:43:20 +0000
commit3d4da98273553b2307d8ce3a03c476e459aa3f45 (patch)
treef0728e73270bdf03a3c42bc2c9d54484feeae711 /src
parentb637048a89654d105a17b6b6f1a060fd8dcfd093 (diff)
downloadrust-3d4da98273553b2307d8ce3a03c476e459aa3f45.tar.gz
rust-3d4da98273553b2307d8ce3a03c476e459aa3f45.zip
Make TraitEngine::new use the right solver, add compare mode
Diffstat (limited to 'src')
-rw-r--r--src/tools/compiletest/src/common.rs1
-rw-r--r--src/tools/compiletest/src/runtest.rs3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
index f796c898731..96fe720630c 100644
--- a/src/tools/compiletest/src/common.rs
+++ b/src/tools/compiletest/src/common.rs
@@ -108,6 +108,7 @@ string_enum! {
         Polonius => "polonius",
         Chalk => "chalk",
         NextSolver => "next-solver",
+        NextSolverCoherence => "next-solver-coherence",
         SplitDwarf => "split-dwarf",
         SplitDwarfSingle => "split-dwarf-single",
     }
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 923b2e63f2e..6582b534488 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2127,6 +2127,9 @@ impl<'test> TestCx<'test> {
             Some(CompareMode::NextSolver) => {
                 rustc.args(&["-Ztrait-solver=next"]);
             }
+            Some(CompareMode::NextSolverCoherence) => {
+                rustc.args(&["-Ztrait-solver=next-coherence"]);
+            }
             Some(CompareMode::SplitDwarf) if self.config.target.contains("windows") => {
                 rustc.args(&["-Csplit-debuginfo=unpacked", "-Zunstable-options"]);
             }