From: bors Date: Wed, 17 Oct 2018 23:16:10 +0000 (+0000) Subject: Auto merge of #55134 - davidtwco:issue-55118, r=pnkfelix X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=f7eb7fbbf6bca0eaa146c4a48cd39c133a257706;p=rust.git Auto merge of #55134 - davidtwco:issue-55118, r=pnkfelix NLL: change compare-mode=nll to use borrowck=migrate Fixes #55118. This PR is split into two parts: The first commit is a minor change that fixes a flaw in the existing `borrowck=migrate` implementation whereby a lint that was promoted to an error in the AST borrow checker would result in the same lint from the NLL borrow checker being downgraded to a warning in migrate mode. This PR fixes this by ensuring lints are exempt from buffering in the NLL borrow checker. The second commit updates `compiletest` to make the NLL compare mode use `-Z borrowck=migrate` rather than `-Z borrowck=mir`. The third commit shows all the test output changes that result from this. r? @pnkfelix --- f7eb7fbbf6bca0eaa146c4a48cd39c133a257706