Skip to content

Commit 70a21e8

Browse files
committed
Auto merge of #53441 - toidiu:ak-fix53419, r=nikomatsakis
fix for late-bound regions Fix for #53419 r? @nikomatsakis
2 parents 8785e34 + c63b633 commit 70a21e8

File tree

51 files changed

+94
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+94
-23
lines changed

src/liballoc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
#![cfg_attr(not(test), feature(fn_traits))]
7878
#![cfg_attr(not(test), feature(generator_trait))]
7979
#![cfg_attr(not(stage0), feature(nll))]
80+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
8081
#![cfg_attr(test, feature(test))]
8182

8283
#![feature(allocator_api)]

src/liballoc_jemalloc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#![feature(libc)]
1818
#![feature(linkage)]
1919
#![cfg_attr(not(stage0), feature(nll))]
20+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2021
#![feature(staged_api)]
2122
#![feature(rustc_attrs)]
2223
#![cfg_attr(dummy_jemalloc, allow(dead_code, unused_extern_crates))]

src/liballoc_system/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#![feature(allocator_api)]
1919
#![feature(core_intrinsics)]
2020
#![cfg_attr(not(stage0), feature(nll))]
21+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2122
#![feature(staged_api)]
2223
#![feature(rustc_attrs)]
2324
#![cfg_attr(any(unix, target_os = "cloudabi", target_os = "redox"), feature(libc))]

src/libarena/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#![feature(core_intrinsics)]
2828
#![feature(dropck_eyepatch)]
2929
#![cfg_attr(not(stage0), feature(nll))]
30+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
3031
#![feature(raw_vec_internals)]
3132
#![cfg_attr(test, feature(test))]
3233

src/libcore/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
#![feature(link_llvm_intrinsics)]
9393
#![feature(never_type)]
9494
#![cfg_attr(not(stage0), feature(nll))]
95+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
9596
#![feature(exhaustive_patterns)]
9697
#![feature(macro_at_most_once_rep)]
9798
#![feature(no_core)]

src/libfmt_macros/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
test(attr(deny(warnings))))]
2222

2323
#![cfg_attr(not(stage0), feature(nll))]
24+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2425

2526
pub use self::Piece::*;
2627
pub use self::Position::*;

src/libgraphviz/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@
289289
test(attr(allow(unused_variables), deny(warnings))))]
290290

291291
#![cfg_attr(not(stage0), feature(nll))]
292+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
292293
#![feature(str_escape)]
293294

294295
use self::LabelText::*;

src/libpanic_abort/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#![feature(core_intrinsics)]
2626
#![feature(libc)]
2727
#![cfg_attr(not(stage0), feature(nll))]
28+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2829
#![feature(panic_runtime)]
2930
#![feature(staged_api)]
3031
#![feature(rustc_attrs)]

src/libpanic_unwind/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#![feature(lang_items)]
3636
#![feature(libc)]
3737
#![cfg_attr(not(stage0), feature(nll))]
38+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
3839
#![feature(panic_unwind)]
3940
#![feature(raw)]
4041
#![feature(staged_api)]

src/libproc_macro/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))]
3333

3434
#![cfg_attr(not(stage0), feature(nll))]
35+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
3536
#![feature(rustc_private)]
3637
#![feature(staged_api)]
3738
#![feature(lang_items)]

src/libprofiler_builtins/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
issue = "0")]
1717
#![allow(unused_features)]
1818
#![cfg_attr(not(stage0), feature(nll))]
19+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1920
#![feature(staged_api)]

src/librustc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#![feature(exhaustive_patterns)]
5252
#![feature(extern_types)]
5353
#![cfg_attr(not(stage0), feature(nll))]
54+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
5455
#![feature(non_exhaustive)]
5556
#![feature(proc_macro_internals)]
5657
#![feature(quote)]

src/librustc_allocator/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
#![cfg_attr(not(stage0), feature(nll))]
12+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1213
#![feature(rustc_private)]
1314

1415
#[macro_use] extern crate log;

src/librustc_apfloat/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#![forbid(unsafe_code)]
4747

4848
#![cfg_attr(not(stage0), feature(nll))]
49+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
4950
#![feature(try_from)]
5051
// See librustc_cratesio_shim/Cargo.toml for a comment explaining this.
5152
#[allow(unused_extern_crates)]

src/librustc_asan/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![sanitizer_runtime]
1212
#![feature(alloc_system)]
1313
#![cfg_attr(not(stage0), feature(nll))]
14+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1415
#![feature(sanitizer_runtime)]
1516
#![feature(staged_api)]
1617
#![no_std]

src/librustc_borrowck/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#![allow(non_camel_case_types)]
1616

1717
#![cfg_attr(not(stage0), feature(nll))]
18+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1819
#![feature(quote)]
1920

2021
#![recursion_limit="256"]

src/librustc_codegen_llvm/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#![allow(unused_attributes)]
2828
#![feature(libc)]
2929
#![cfg_attr(not(stage0), feature(nll))]
30+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
3031
#![feature(quote)]
3132
#![feature(range_contains)]
3233
#![feature(rustc_diagnostic_macros)]

src/librustc_codegen_utils/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#![feature(box_syntax)]
2121
#![feature(custom_attribute)]
2222
#![cfg_attr(not(stage0), feature(nll))]
23+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2324
#![allow(unused_attributes)]
2425
#![feature(quote)]
2526
#![feature(rustc_diagnostic_macros)]

src/librustc_cratesio_shim/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#![allow(unused_extern_crates)]
1313

1414
#![cfg_attr(not(stage0), feature(nll))]
15+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1516

1617
extern crate bitflags;
1718
extern crate log;

src/librustc_data_structures/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#![feature(optin_builtin_traits)]
2828
#![cfg_attr(stage0, feature(macro_vis_matcher))]
2929
#![cfg_attr(not(stage0), feature(nll))]
30+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
3031
#![feature(allow_internal_unstable)]
3132
#![feature(vec_resize_with)]
3233

src/librustc_driver/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#![feature(box_syntax)]
2222
#![cfg_attr(unix, feature(libc))]
2323
#![cfg_attr(not(stage0), feature(nll))]
24+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2425
#![feature(option_replace)]
2526
#![feature(quote)]
2627
#![feature(rustc_diagnostic_macros)]

src/librustc_errors/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#![feature(range_contains)]
1818
#![cfg_attr(unix, feature(libc))]
1919
#![cfg_attr(not(stage0), feature(nll))]
20+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2021
#![feature(optin_builtin_traits)]
2122

2223
extern crate atty;

src/librustc_incremental/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
html_root_url = "https://doc.rust-lang.org/nightly/")]
1616

1717
#![cfg_attr(not(stage0), feature(nll))]
18+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1819
#![feature(specialization)]
1920

2021
#![recursion_limit="256"]

src/librustc_lint/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#![feature(box_syntax)]
2929
#![cfg_attr(stage0, feature(macro_vis_matcher))]
3030
#![cfg_attr(not(stage0), feature(nll))]
31+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
3132
#![feature(quote)]
3233
#![feature(rustc_diagnostic_macros)]
3334
#![feature(macro_at_most_once_rep)]

src/librustc_llvm/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
#![cfg_attr(not(stage0), feature(nll))]
12+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1213
#![feature(static_nobundle)]
1314

1415
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

src/librustc_lsan/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![sanitizer_runtime]
1212
#![feature(alloc_system)]
1313
#![cfg_attr(not(stage0), feature(nll))]
14+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1415
#![feature(sanitizer_runtime)]
1516
#![feature(staged_api)]
1617
#![no_std]

src/librustc_metadata/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#![feature(libc)]
1717
#![feature(macro_at_most_once_rep)]
1818
#![cfg_attr(not(stage0), feature(nll))]
19+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1920
#![feature(proc_macro_internals)]
2021
#![feature(proc_macro_quote)]
2122
#![feature(quote)]

src/librustc_mir/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
1515
*/
1616

1717
#![cfg_attr(not(stage0), feature(nll))]
18-
#![feature(infer_outlives_requirements)]
18+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1919
#![feature(in_band_lifetimes)]
2020
#![feature(slice_patterns)]
2121
#![feature(slice_sort_by_cached_key)]

src/librustc_msan/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![sanitizer_runtime]
1212
#![feature(alloc_system)]
1313
#![cfg_attr(not(stage0), feature(nll))]
14+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1415
#![feature(sanitizer_runtime)]
1516
#![feature(staged_api)]
1617
#![no_std]

src/librustc_passes/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
html_root_url = "https://doc.rust-lang.org/nightly/")]
2020

2121
#![cfg_attr(not(stage0), feature(nll))]
22+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2223
#![feature(rustc_diagnostic_macros)]
2324

2425
#[macro_use]

src/librustc_platform_intrinsics/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![allow(bad_style)]
1212

1313
#![cfg_attr(not(stage0), feature(nll))]
14+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1415

1516
pub struct Intrinsic {
1617
pub inputs: &'static [&'static Type],

src/librustc_plugin/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
html_root_url = "https://doc.rust-lang.org/nightly/")]
6666

6767
#![cfg_attr(not(stage0), feature(nll))]
68+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
6869
#![feature(rustc_diagnostic_macros)]
6970

7071
#[macro_use] extern crate syntax;

src/librustc_privacy/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
html_root_url = "https://doc.rust-lang.org/nightly/")]
1414

1515
#![cfg_attr(not(stage0), feature(nll))]
16+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1617
#![feature(rustc_diagnostic_macros)]
1718

1819
#![recursion_limit="256"]

src/librustc_resolve/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#![feature(crate_visibility_modifier)]
1616
#![cfg_attr(not(stage0), feature(nll))]
17+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1718
#![feature(rustc_diagnostic_macros)]
1819
#![feature(slice_sort_by_cached_key)]
1920

src/librustc_save_analysis/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
html_root_url = "https://doc.rust-lang.org/nightly/")]
1414
#![feature(custom_attribute)]
1515
#![cfg_attr(not(stage0), feature(nll))]
16+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1617
#![allow(unused_attributes)]
1718

1819
#![recursion_limit="256"]

src/librustc_target/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#![feature(box_syntax)]
2525
#![feature(const_fn)]
2626
#![cfg_attr(not(stage0), feature(nll))]
27+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
2728
#![feature(slice_patterns)]
2829

2930
#[macro_use]

src/librustc_traits/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#![feature(extern_prelude)]
1717
#![feature(in_band_lifetimes)]
1818
#![cfg_attr(not(stage0), feature(nll))]
19+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1920

2021
#![recursion_limit="256"]
2122

src/librustc_tsan/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![sanitizer_runtime]
1212
#![feature(alloc_system)]
1313
#![cfg_attr(not(stage0), feature(nll))]
14+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
1415
#![feature(sanitizer_runtime)]
1516
#![feature(staged_api)]
1617
#![no_std]

src/librustc_typeck/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ This API is completely unstable and subject to change.
7676
#![feature(crate_visibility_modifier)]
7777
#![feature(exhaustive_patterns)]
7878
#![cfg_attr(not(stage0), feature(nll))]
79+
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
7980
#![feature(quote)]
8081
#![feature(refcell_replace_swap)]
8182
#![feature(rustc_diagnostic_macros)]

0 commit comments

Comments
 (0)