]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #53441 - toidiu:ak-fix53419, r=nikomatsakis
authorbors <bors@rust-lang.org>
Mon, 27 Aug 2018 17:42:45 +0000 (17:42 +0000)
committerbors <bors@rust-lang.org>
Mon, 27 Aug 2018 17:42:45 +0000 (17:42 +0000)
fix for late-bound regions

Fix for https://github.com/rust-lang/rust/issues/53419

r? @nikomatsakis

13 files changed:
1  2 
src/liballoc_jemalloc/lib.rs
src/libcore/lib.rs
src/libpanic_abort/lib.rs
src/librustc/lib.rs
src/librustc_driver/lib.rs
src/librustc_lint/lib.rs
src/librustc_privacy/lib.rs
src/librustc_resolve/lib.rs
src/librustc_save_analysis/lib.rs
src/librustc_traits/lib.rs
src/librustc_typeck/lib.rs
src/librustdoc/lib.rs
src/libstd/lib.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 7fe1af819512951ec02cd061c4e54585d66b2338,d61c34d1c0078dda9718b4e820a35b4e73a56980..971dfa751f11a300c5679575c6e33796bc8b521b
  #![feature(crate_in_paths)]
  #![feature(crate_visibility_modifier)]
  #![feature(extern_prelude)]
 -#![feature(iterator_find_map)]
  #![feature(in_band_lifetimes)]
  #![cfg_attr(not(stage0), feature(nll))]
+ #![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
  
  #![recursion_limit="256"]
  
index 2239154cbb70f4c8639945509db2498d0484de6f,019d2de1cc7fc8114a164759a6a33049c793891a..d4460bd1168eb2314553aa172f54e63bc7613c2e
@@@ -75,7 -75,9 +75,8 @@@ This API is completely unstable and sub
  #![feature(box_syntax)]
  #![feature(crate_visibility_modifier)]
  #![feature(exhaustive_patterns)]
 -#![feature(iterator_find_map)]
  #![cfg_attr(not(stage0), feature(nll))]
+ #![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
  #![feature(quote)]
  #![feature(refcell_replace_swap)]
  #![feature(rustc_diagnostic_macros)]
index db19860d22361681e9526abd4c533b74cd5aeef3,0611073daa6c47802fc08f33522dfe506520283c..279151eb26def8943d4606c7a854fdd6f9ba6e34
@@@ -16,7 -16,9 +16,8 @@@
  #![feature(rustc_private)]
  #![feature(box_patterns)]
  #![feature(box_syntax)]
 -#![feature(iterator_find_map)]
  #![cfg_attr(not(stage0), feature(nll))]
+ #![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
  #![feature(set_stdio)]
  #![feature(slice_sort_by_cached_key)]
  #![feature(test)]
Simple merge