diff options
| author | Adam Perry <adam.n.perry@gmail.com> | 2019-10-02 18:24:10 -0700 |
|---|---|---|
| committer | Adam Perry <adam.n.perry@gmail.com> | 2019-10-07 08:05:22 -0700 |
| commit | 6c04c8eb8e361649fb541f918e373b23d2d7f772 (patch) | |
| tree | b255c3a9c7b54f6eacbfc52c156eac68e850a1b2 /src/libsyntax | |
| parent | 543449d4fdf7bb7fd4a12c2fea96dafbe26eea90 (diff) | |
track_caller run-pass test, lint cleanup, PR review.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/active.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/libsyntax/feature_gate/active.rs b/src/libsyntax/feature_gate/active.rs index 312a9bf6e75..c90b18fc397 100644 --- a/src/libsyntax/feature_gate/active.rs +++ b/src/libsyntax/feature_gate/active.rs @@ -526,7 +526,7 @@ declare_features! ( (active, raw_dylib, "1.40.0", Some(58713), None), /// Enable accurate caller location reporting during panic (RFC 2091). - (active, track_caller, "1.37.0", Some(47809), None), + (active, track_caller, "1.39.0", Some(47809), None), // ------------------------------------------------------------------------- // feature-group-end: actual feature gates diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index d6a6450e471..ae23cc5cb93 100644 --- a/src/libsyntax/feature_gate/builtin_attrs.rs +++ b/src/libsyntax/feature_gate/builtin_attrs.rs @@ -324,6 +324,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ ), gated!(ffi_returns_twice, Whitelisted, template!(Word), experimental!(ffi_returns_twice)), + gated!(track_caller, Whitelisted, template!(Word), experimental!(track_caller)), // ========================================================================== // Internal attributes: Stability, deprecation, and unsafe: @@ -500,10 +501,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ ) ), gated!( - track_caller, Whitelisted, template!(Word), - "the `#[track_caller]` attribute is an experimental feature", - ), - gated!( // Used in resolve: prelude_import, Whitelisted, template!(Word), "`#[prelude_import]` is for use by rustc only", |