mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip NLL compiletest in rustfix mode for now

Browse Source
This commit is contained in:
Pascal Hertleif 2018-05-02 00:33:59 +02:00 committed by Alex Crichton
parent c02aedfcaf
commit 9680f3b381
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/compiletest/src/common.rs
View File

@ -95,9 +95,9 @@ impl fmt::Display for Mode {
}
}
#[derive(Clone)]
#[derive(Clone, PartialEq)]
pub enum CompareMode {
Nll
Nll,
}
impl CompareMode {

5
src/tools/compiletest/src/runtest.rs
View File

@ -2605,7 +2605,10 @@ impl<'test> TestCx<'test> {
}
let fixture_path = expected_output_path(&self.testpaths, None, &None, UI_FIXED);
if fixture_path.exists() {
// TODO(killercup): Add `nll.rs.fixed` files matching
let nll = self.config.compare_mode.as_ref().map(|x| *x == CompareMode::Nll).unwrap_or(false);
if fixture_path.exists() && !nll {
use std::collections::HashSet;
use rustfix::{apply_suggestions, get_suggestions_from_json};