about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
author1011X <1011XXXXX@gmail.com>2018-03-04 13:35:21 -0500
committer1011X <1011XXXXX@gmail.com>2018-03-04 13:35:21 -0500
commitdf283db4c175d32d7859f981ac67c17669bb1fa8 (patch)
treef199018ad7b4a6d71a5d14e02a6e9d19119ca396 /src/libsyntax
parent4e4c1b5b325c4c474426a7e3c346c316fbc644f1 (diff)
parent1e1bfc715f8dfe36a38d8fae36fcbe92e7463a3f (diff)
downloadrust-df283db4c175d32d7859f981ac67c17669bb1fa8.tar.gz
rust-df283db4c175d32d7859f981ac67c17669bb1fa8.zip
Merge branch 'master' of github.com:1011X/rust
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 70ea015de4e..058df1d5169 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -414,9 +414,6 @@ declare_features! (
     // Allow trait methods with arbitrary self types
     (active, arbitrary_self_types, "1.23.0", Some(44874)),
 
-    // #![wasm_import_memory] attribute
-    (active, wasm_import_memory, "1.22.0", None),
-
     // `crate` in paths
     (active, crate_in_paths, "1.23.0", Some(45477)),
 
@@ -985,11 +982,6 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
                                                         never be stable",
                                                        cfg_fn!(rustc_attrs))),
 
-    ("wasm_import_memory", Whitelisted, Gated(Stability::Unstable,
-                                 "wasm_import_memory",
-                                 "wasm_import_memory attribute is currently unstable",
-                                 cfg_fn!(wasm_import_memory))),
-
     ("rustc_args_required_const", Whitelisted, Gated(Stability::Unstable,
                                  "rustc_attrs",
                                  "never will be stable",