diff options
| author | bors <bors@rust-lang.org> | 2019-11-23 22:23:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-23 22:23:20 +0000 |
| commit | ad808d95c4839caedc2be76d0ed059dc920ab4b6 (patch) | |
| tree | eeb5b6401c97decfd3ebb19f12bddf916712c95d /src/libsyntax | |
| parent | 0c987c5c02498b4e77f5dfae1f6914ffb9268575 (diff) | |
| parent | c215de006230208afa77f4c8bb2715ecabf5b1a4 (diff) | |
| download | rust-ad808d95c4839caedc2be76d0ed059dc920ab4b6.tar.gz rust-ad808d95c4839caedc2be76d0ed059dc920ab4b6.zip | |
Auto merge of #66680 - Centril:rollup-1ke3svj, r=Centril
Rollup of 5 pull requests Successful merges: - #61351 (Stabilize cfg(doc)) - #66539 (Point at type in `let` assignment on type errors) - #66655 (rustdoc: Mark `--extern-private` as unstable) - #66657 (rustdoc: Don't panic when failing to write .lock file) - #66673 (Move def collector from `rustc` to `rustc_resolve`) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index a13a4475ef0..a9f41633f30 100644 --- a/src/libsyntax/feature_gate/builtin_attrs.rs +++ b/src/libsyntax/feature_gate/builtin_attrs.rs @@ -30,7 +30,6 @@ const GATED_CFGS: &[(Symbol, Symbol, GateFn)] = &[ (sym::target_thread_local, sym::cfg_target_thread_local, cfg_fn!(cfg_target_thread_local)), (sym::target_has_atomic, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)), (sym::target_has_atomic_load_store, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)), - (sym::doc, sym::doc_cfg, cfg_fn!(doc_cfg)), ]; #[derive(Debug)] |