about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-09-30 01:45:50 +0000
committerbors <bors@rust-lang.org>2018-09-30 01:45:50 +0000
commit6310be458f4665f537419f033a764b0644c7e5ab (patch)
tree89427e9623f634be3528a30ca9441475d83b7e58 /src/libsyntax
parente0a1ab6374340a4b9ca9f0c6d387763cf163526e (diff)
parentd40b6cf086734109ec402aa546eca4d3925732ca (diff)
downloadrust-6310be458f4665f537419f033a764b0644c7e5ab.tar.gz
rust-6310be458f4665f537419f033a764b0644c7e5ab.zip
Auto merge of #54601 - cuviper:prep-1.31, r=Mark-Simulacrum
Bump to 1.31.0 and bootstrap from 1.30 beta

Closes #54594.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index a1b031a655f..9077eca1821 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -21,7 +21,7 @@
 
 #![feature(crate_visibility_modifier)]
 #![feature(macro_at_most_once_rep)]
-#![cfg_attr(not(stage0), feature(nll))]
+#![feature(nll)]
 #![feature(rustc_attrs)]
 #![feature(rustc_diagnostic_macros)]
 #![feature(slice_sort_by_cached_key)]