about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-09-05 17:55:45 -0700
committerGitHub <noreply@github.com>2016-09-05 17:55:45 -0700
commite1d0de82cc40b666b88d4a6d2c9dcbc81d7ed27f (patch)
tree4c66194f1f9e81d885971ee0b0572309f9cacdde /src/libsyntax
parentcbe4de78e2daf84499988c79317c0862b8106115 (diff)
parent20ec61e04309bfd9450bcde9176c883478af46de (diff)
downloadrust-e1d0de82cc40b666b88d4a6d2c9dcbc81d7ed27f.tar.gz
rust-e1d0de82cc40b666b88d4a6d2c9dcbc81d7ed27f.zip
Auto merge of #36274 - Manishearth:rollup, r=Manishearth
Rollup of 6 pull requests

- Successful merges: #35845, #35983, #36065, #36102, #36242, #36245
- Failed merges:
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 287d33cc3e5..dd2956f706c 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -308,6 +308,7 @@ declare_features! (
     (removed, struct_inherit, "1.0.0", None),
     (removed, test_removed_feature, "1.0.0", None),
     (removed, visible_private_types, "1.0.0", None),
+    (removed, unsafe_no_drop_flag, "1.0.0", None),
 );
 
 declare_features! (