Skip to content

Commit 3e9a1a1

Browse files
Rollup merge of #53230 - memoryruins:nll_bootstrap_4, r=nikomatsakis
[nll] enable feature(nll) on various crates for bootstrap: part 4 #53172 r? @nikomatsakis
2 parents f1ae95f + 0123ac1 commit 3e9a1a1

File tree

24 files changed

+25
-4
lines changed

24 files changed

+25
-4
lines changed

src/libcore/lib.rs

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

src/libproc_macro/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
test(no_crate_inject, attr(deny(warnings))),
3232
test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))]
3333

34+
#![cfg_attr(not(stage0), feature(nll))]
3435
#![feature(rustc_private)]
3536
#![feature(staged_api)]
3637
#![feature(lang_items)]

src/libprofiler_builtins/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
reason = "internal implementation detail of rustc right now",
1616
issue = "0")]
1717
#![allow(unused_features)]
18+
#![cfg_attr(not(stage0), feature(nll))]
1819
#![feature(staged_api)]

src/librustc/lib.rs

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

src/librustc_allocator/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![cfg_attr(not(stage0), feature(nll))]
1112
#![feature(rustc_private)]
1213

1314
#[macro_use] extern crate log;

src/librustc_codegen_llvm/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#![feature(in_band_lifetimes)]
2727
#![allow(unused_attributes)]
2828
#![feature(libc)]
29+
#![cfg_attr(not(stage0), feature(nll))]
2930
#![feature(quote)]
3031
#![feature(range_contains)]
3132
#![feature(rustc_diagnostic_macros)]

src/librustc_codegen_llvm/llvm/ffi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ extern "C" {
15641564
-> LLVMRustResult;
15651565
pub fn LLVMRustArchiveMemberNew(Filename: *const c_char,
15661566
Name: *const c_char,
1567-
Child: Option<&'a ArchiveChild>)
1567+
Child: Option<&ArchiveChild<'a>>)
15681568
-> &'a mut RustArchiveMember<'a>;
15691569
pub fn LLVMRustArchiveMemberFree(Member: &'a mut RustArchiveMember<'a>);
15701570

src/librustc_codegen_llvm/type_of.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ fn uncached_llvm_type<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>,
8989
Type::struct_(cx, &[fill], packed)
9090
}
9191
Some(ref name) => {
92-
let mut llty = Type::named_struct(cx, name);
92+
let llty = Type::named_struct(cx, name);
9393
llty.set_struct_body(&[fill], packed);
9494
llty
9595
}

src/librustc_codegen_utils/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#![feature(box_patterns)]
2020
#![feature(box_syntax)]
2121
#![feature(custom_attribute)]
22+
#![cfg_attr(not(stage0), feature(nll))]
2223
#![allow(unused_attributes)]
2324
#![feature(quote)]
2425
#![feature(rustc_diagnostic_macros)]

src/librustc_data_structures/indexed_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ fn test_set_up_to() {
323323
#[test]
324324
fn test_new_filled() {
325325
for i in 0..128 {
326-
let mut idx_buf = IdxSetBuf::new_filled(i);
326+
let idx_buf = IdxSetBuf::new_filled(i);
327327
let elems: Vec<usize> = idx_buf.iter().collect();
328328
let expected: Vec<usize> = (0..i).collect();
329329
assert_eq!(elems, expected);

0 commit comments

Comments
 (0)