diff options
| author | Bastian Köcher <git@kchr.de> | 2017-12-05 12:10:47 +0100 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2017-12-26 12:26:39 +0100 |
| commit | 011c9eac357ea4a02a4e4f821d0cb1e043b0227d (patch) | |
| tree | 535812738573fe3a0c990c5c02fda8780287ab77 | |
| parent | 19adeaa3c6482fb52a7926cba1e3842e788177eb (diff) | |
| download | rust-011c9eac357ea4a02a4e4f821d0cb1e043b0227d.tar.gz rust-011c9eac357ea4a02a4e4f821d0cb1e043b0227d.zip | |
Fixes compile bug caused by upstream changes
| -rw-r--r-- | src/librustc_mir/monomorphize/collector.rs | 2 | ||||
| -rw-r--r-- | src/librustc_trans/base.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs index 056c6989aba..afd895eb7ca 100644 --- a/src/librustc_mir/monomorphize/collector.rs +++ b/src/librustc_mir/monomorphize/collector.rs @@ -1032,7 +1032,7 @@ impl<'b, 'a, 'v> RootCollector<'b, 'a, 'v> { // late-bound regions, since late-bound // regions must appear in the argument // listing. - let main_ret_ty = self.tcx.no_late_bound_regions(&main_ret_ty).unwrap(); + let main_ret_ty = main_ret_ty.no_late_bound_regions().unwrap(); let start_instance = Instance::resolve( self.tcx, diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs index b2d516e7868..3955171f939 100644 --- a/src/librustc_trans/base.rs +++ b/src/librustc_trans/base.rs @@ -563,7 +563,7 @@ fn maybe_create_entry_wrapper(ccx: &CrateContext) { // late-bound regions, since late-bound // regions must appear in the argument // listing. - let main_ret_ty = ccx.tcx().no_late_bound_regions(&main_ret_ty).unwrap(); + let main_ret_ty = main_ret_ty.no_late_bound_regions().unwrap(); if declare::get_defined_value(ccx, "main").is_some() { // FIXME: We should be smart and show a better diagnostic here. |