diff options
| author | bors <bors@rust-lang.org> | 2017-10-05 13:25:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-05 13:25:55 +0000 |
| commit | 1db1144277abbf1ffc14d4e9a143cf87d1ef6d41 (patch) | |
| tree | 5af0e3d7aca785eede0d2a1b7f0164cd2b5ee47d /src/libsyntax | |
| parent | abef7e1fd26e6828bbba457173a76d150b1378d8 (diff) | |
| parent | 5440733971d1abf0f42fe05d4345468bd0f78787 (diff) | |
| download | rust-1db1144277abbf1ffc14d4e9a143cf87d1ef6d41.tar.gz rust-1db1144277abbf1ffc14d4e9a143cf87d1ef6d41.zip | |
Auto merge of #45046 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests - Successful merges: #44664, #44935, #44972, #44980, #44987, #44997, #45006, #45017, #45024 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 0504e889ea1..86571f921f0 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1927,7 +1927,7 @@ pub enum ItemKind { /// /// E.g. `trait Foo { .. }` or `trait Foo<T> { .. }` Trait(Unsafety, Generics, TyParamBounds, Vec<TraitItem>), - // Default trait implementation. + /// Auto trait implementation. /// /// E.g. `impl Trait for .. {}` or `impl<T> Trait<T> for .. {}` DefaultImpl(Unsafety, TraitRef), diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index f6e85ed6725..1dac0433f14 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -378,7 +378,7 @@ declare_features! ( // #[doc(cfg(...))] (active, doc_cfg, "1.21.0", Some(43781)), // #[doc(masked)] - (active, doc_masked, "1.21.0", None), + (active, doc_masked, "1.21.0", Some(44027)), // allow `#[must_use]` on functions and comparison operators (RFC 1940) (active, fn_must_use, "1.21.0", Some(43302)), |