diff options
| author | bors <bors@rust-lang.org> | 2019-05-17 13:01:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-17 13:01:23 +0000 |
| commit | b982867a7349f84c17317599b59aeb5a7d8a83be (patch) | |
| tree | 1e74728d4b88f335cb3c21633fa7ce5cd3282637 /src/tools/compiletest | |
| parent | 39401465da4ce27aeeb2c2a26133ac35c63aa515 (diff) | |
| parent | be5fe051a843cfbbc1ba4fcd347b641417181b8f (diff) | |
| download | rust-b982867a7349f84c17317599b59aeb5a7d8a83be.tar.gz rust-b982867a7349f84c17317599b59aeb5a7d8a83be.zip | |
Auto merge of #60171 - matthewjasper:full-nll-compare-mode, r=pnkfelix
Use -Zborrowck=mir for NLL compare mode closes #56993 r? @pnkfelix
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 1e4deee6bf1..2082de7cbce 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1911,8 +1911,7 @@ impl<'test> TestCx<'test> { match self.config.compare_mode { Some(CompareMode::Nll) => { - // FIXME(#56993) use -Zborrowck=mir - rustc.args(&["-Zborrowck=migrate"]); + rustc.args(&["-Zborrowck=mir"]); } Some(CompareMode::Polonius) => { rustc.args(&["-Zpolonius", "-Zborrowck=mir"]); |