diff options
| author | bors <bors@rust-lang.org> | 2019-10-31 11:51:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-31 11:51:42 +0000 |
| commit | 92df638162b7ccea6f97a8e1287ed05c5c0818b4 (patch) | |
| tree | e1ed62196fda23400c26658f3b100764abc58490 /src/libsyntax | |
| parent | b3a0350c2bf5d93cb734257bbddc8300bef4b851 (diff) | |
| parent | 1595fdee1f9bff2901bcd3cd3fd7a22ea64cac24 (diff) | |
| download | rust-92df638162b7ccea6f97a8e1287ed05c5c0818b4.tar.gz rust-92df638162b7ccea6f97a8e1287ed05c5c0818b4.zip | |
Auto merge of #63803 - GuillaumeGomez:stabilize-doctest, r=ollie27,QuietMisdreavus,Mark-Simulacrum
[rustdoc] stabilize cfg(doctest) Fixes #62210. Since we removed rustdoc from providing cfg(test) on test runs, it's been replaced by cfg(doctest). It'd be nice to have it in not too far in the future.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/accepted.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate/active.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/feature_gate/accepted.rs b/src/libsyntax/feature_gate/accepted.rs index d309a17298b..a1cf2d42108 100644 --- a/src/libsyntax/feature_gate/accepted.rs +++ b/src/libsyntax/feature_gate/accepted.rs @@ -251,6 +251,8 @@ declare_features! ( (accepted, non_exhaustive, "1.40.0", Some(44109), None), /// Allows calling constructor functions in `const fn`. (accepted, const_constructor, "1.40.0", Some(61456), None), + /// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests. + (accepted, cfg_doctest, "1.40.0", Some(62210), None), // ------------------------------------------------------------------------- // feature-group-end: accepted features diff --git a/src/libsyntax/feature_gate/active.rs b/src/libsyntax/feature_gate/active.rs index 22638a1376c..736a363bbfc 100644 --- a/src/libsyntax/feature_gate/active.rs +++ b/src/libsyntax/feature_gate/active.rs @@ -506,9 +506,6 @@ declare_features! ( /// Allows `async || body` closures. (active, async_closure, "1.37.0", Some(62290), None), - /// Allows the use of `#[cfg(doctest)]`; set when rustdoc is collecting doctests. - (active, cfg_doctest, "1.37.0", Some(62210), None), - /// Allows `[x; N]` where `x` is a constant (RFC 2203). (active, const_in_array_repeat_expressions, "1.37.0", Some(49147), None), diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index efe84238795..eb811c3e0ff 100644 --- a/src/libsyntax/feature_gate/builtin_attrs.rs +++ b/src/libsyntax/feature_gate/builtin_attrs.rs @@ -31,7 +31,6 @@ const GATED_CFGS: &[(Symbol, Symbol, GateFn)] = &[ (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::rustdoc, sym::doc_cfg, cfg_fn!(doc_cfg)), - (sym::doctest, sym::cfg_doctest, cfg_fn!(cfg_doctest)), ]; #[derive(Debug)] |