diff options
| author | bors <bors@rust-lang.org> | 2019-10-09 03:32:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-09 03:32:21 +0000 |
| commit | 275cf4bcacad3fbe5539ecd5840462793ae46eec (patch) | |
| tree | 907f93d50a06e4997a8b0b29214bc219243810c6 /src/libsyntax | |
| parent | b5bd31ec6db6a249311888a93fc176f06dcb6aa6 (diff) | |
| parent | e27f0298363f6ca60bb5761a8c74d52b3999a061 (diff) | |
| download | rust-275cf4bcacad3fbe5539ecd5840462793ae46eec.tar.gz rust-275cf4bcacad3fbe5539ecd5840462793ae46eec.zip | |
Auto merge of #65229 - Centril:rollup-wnr46vg, r=Centril
Rollup of 4 pull requests Successful merges: - #64656 (Implement (HashMap) Entry::insert as per #60142) - #65037 (`#[track_caller]` feature gate (RFC 2091 1/N)) - #65166 (Suggest to add `move` keyword for generator capture) - #65175 (add more info in debug traces for gcu merging) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/active.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate/active.rs b/src/libsyntax/feature_gate/active.rs index 19ef430318d..94f0995566f 100644 --- a/src/libsyntax/feature_gate/active.rs +++ b/src/libsyntax/feature_gate/active.rs @@ -525,6 +525,9 @@ declare_features! ( // Allows the use of raw-dylibs (RFC 2627). (active, raw_dylib, "1.40.0", Some(58713), None), + /// Enable accurate caller location reporting during panic (RFC 2091). + (active, track_caller, "1.40.0", Some(47809), None), + // ------------------------------------------------------------------------- // feature-group-end: actual feature gates // ------------------------------------------------------------------------- @@ -540,4 +543,5 @@ pub const INCOMPLETE_FEATURES: &[Symbol] = &[ sym::or_patterns, sym::let_chains, sym::raw_dylib, + sym::track_caller, ]; diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index c12d0ce06ff..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: |