about summary refs log tree commit diff
path: root/src/libsyntax_pos
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_pos
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_pos')
-rw-r--r--src/libsyntax_pos/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs
index 67fd847a2ae..45eaf1d3190 100644
--- a/src/libsyntax_pos/lib.rs
+++ b/src/libsyntax_pos/lib.rs
@@ -21,11 +21,11 @@
 #![feature(const_fn)]
 #![feature(crate_visibility_modifier)]
 #![feature(custom_attribute)]
-#![cfg_attr(not(stage0), feature(nll))]
+#![feature(nll)]
 #![feature(non_exhaustive)]
 #![feature(optin_builtin_traits)]
 #![feature(specialization)]
-#![feature(stdsimd)]
+#![cfg_attr(not(stage0), feature(stdsimd))]
 
 use std::borrow::Cow;
 use std::cell::Cell;