diff options
| author | bors <bors@rust-lang.org> | 2017-04-20 01:56:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-20 01:56:59 +0000 |
| commit | 1bb1530239c801bb46b705eb2874ac4e5b213e54 (patch) | |
| tree | 88782f0acc8bcbcfe082ac5e746ecdde170d3183 /src/libsyntax | |
| parent | 452bf0852e1d47f7478d8b81328c15b183c6d971 (diff) | |
| parent | 1c69895f865b710ab72a5e354208ebbc9ed95069 (diff) | |
| download | rust-1bb1530239c801bb46b705eb2874ac4e5b213e54.tar.gz rust-1bb1530239c801bb46b705eb2874ac4e5b213e54.zip | |
Auto merge of #41411 - frewsxcv:rollup, r=frewsxcv
Rollup of 7 pull requests - Successful merges: #41295, #41348, #41374, #41380, #41391, #41398, #41403 - Failed merges: #41376
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 129674b7476..175447e1112 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -344,9 +344,6 @@ declare_features! ( // Used to preserve symbols (see llvm.used) (active, used, "1.18.0", Some(40289)), - // Hack to document `-Z linker-flavor` in The Unstable Book - (active, linker_flavor, "1.18.0", Some(41142)), - // Allows module-level inline assembly by way of global_asm!() (active, global_asm, "1.18.0", Some(35119)), |