about summary refs log tree commit diff
path: root/src/libsyntax_pos/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-02-12 05:50:26 +0000
committerbors <bors@rust-lang.org>2019-02-12 05:50:26 +0000
commit75f9159009cd0814bd6b5c3bf6a5406de7c4fe8d (patch)
treedbfb36089ef3b8fc32fc5127e206e775411ce821 /src/libsyntax_pos/lib.rs
parentba2853b6d3a197cdbec5543be2592ca430b49af6 (diff)
parent33d2c9f5337215963d67d855f0c64919bd7407a4 (diff)
Auto merge of #58389 - Centril:rollup, r=Centril
Rollup of 11 pull requests

Successful merges:

 - #58105 (libarena => 2018)
 - #58111 (libterm => 2018)
 - #58287 (rustc-std-workspace-core => 2018)
 - #58288 (rustc-workspace-hack => 2018)
 - #58300 (librustc_typeck => 2018)
 - #58313 (Use `?` in librustc macros)
 - #58318 (libserialize => 2018)
 - #58322 (librustc_codegen_ssa => 2018)
 - #58342 (Revert removed #![feature(nll)])
 - #58367 (Remove two dead functions.)
 - #58382 (docs: remove "experimental" wording from std::os::unix)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libsyntax_pos/lib.rs')
-rw-r--r--src/libsyntax_pos/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs
index 70c45f7f9a7..dbb4f8f8159 100644
--- a/src/libsyntax_pos/lib.rs
+++ b/src/libsyntax_pos/lib.rs
@@ -11,6 +11,7 @@
 #![feature(const_fn)]
 #![feature(crate_visibility_modifier)]
 #![feature(custom_attribute)]
+#![feature(nll)]
 #![feature(non_exhaustive)]
 #![feature(optin_builtin_traits)]
 #![feature(rustc_attrs)]