diff options
| author | bors <bors@rust-lang.org> | 2018-12-04 23:40:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-04 23:40:06 +0000 |
| commit | abe02cefd6cd1916df62ad7dc80161bea50b72e8 (patch) | |
| tree | f0da4847d4839eb456ac3cd57204d5a756de44ef /src/librustc_mir | |
| parent | bdb3f532d7a393b1da512dbc1bed65c9eb63846e (diff) | |
| parent | 6d54f6d6b1181e6fa7c5934ea3b4d6bfd1775512 (diff) | |
| download | rust-1.31.0.tar.gz rust-1.31.0.zip | |
Auto merge of #56518 - pietroalbini:stable-additions, r=pietroalbini 1.31.0
[stable] Add a few critical fixes to the 1.31.0 release This PR cherry-picks the following PRs to stable: * #56467: Bump stack size to 32MB * #56486: Propagate all closure requirements to the caller * #56519: update edition guide The changes will be included in the final 1.31.0 binary (to avoid a point release). To deploy the build to dev-static the old manifest needs to be removed from the bucket after the PR is merged. cc @rust-lang/core @rust-lang/release @rust-lang/compiler r? @alexcrichton
Diffstat (limited to 'src/librustc_mir')
| -rw-r--r-- | src/librustc_mir/borrow_check/nll/region_infer/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs index 50fd4afcd7e..82e0b3495da 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs @@ -1196,7 +1196,7 @@ impl<'tcx> RegionInferenceContext<'tcx> { blame_span: blame_span_category.1, category: blame_span_category.0, }); - return; + continue; } } |