diff options
| author | bors <bors@rust-lang.org> | 2019-11-20 19:15:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-20 19:15:41 +0000 |
| commit | f1b882b55805c342e46ee4ca3beeef1d1fa2044b (patch) | |
| tree | a76cffee5474f8b62ff9218cf85852304acd6cb4 /src/libsyntax | |
| parent | b9cf5417892ef242c783ef963deff5436205b0f6 (diff) | |
| parent | 8754409159112776e9da43c62e2e66bbfabf59ab (diff) | |
| download | rust-f1b882b55805c342e46ee4ca3beeef1d1fa2044b.tar.gz rust-f1b882b55805c342e46ee4ca3beeef1d1fa2044b.zip | |
Auto merge of #66578 - Centril:rollup-pgz1v7t, r=Centril
Rollup of 7 pull requests Successful merges: - #66060 (Making ICEs and test them in incremental) - #66298 (rustdoc: fixes #64305: disable search field instead of hidding it) - #66457 (Just derive Hashstable in librustc) - #66496 (rustc_metadata: Privatize more things) - #66514 (Fix selected crate search filter) - #66535 (Avoid ICE when `break`ing to an unreachable label) - #66573 (Ignore run-make reproducible-build-2 on Mac) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index 57dae23f0dc..a13a4475ef0 100644 --- a/src/libsyntax/feature_gate/builtin_attrs.rs +++ b/src/libsyntax/feature_gate/builtin_attrs.rs @@ -543,7 +543,10 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ rustc_attr!(TEST, rustc_variance, Normal, template!(Word)), rustc_attr!(TEST, rustc_layout, Normal, template!(List: "field1, field2, ...")), rustc_attr!(TEST, rustc_regions, Normal, template!(Word)), - rustc_attr!(TEST, rustc_error, Whitelisted, template!(Word)), + rustc_attr!( + TEST, rustc_error, Whitelisted, + template!(Word, List: "delay_span_bug_from_inside_query") + ), rustc_attr!(TEST, rustc_dump_user_substs, Whitelisted, template!(Word)), rustc_attr!(TEST, rustc_if_this_changed, Whitelisted, template!(Word, List: "DepNode")), rustc_attr!(TEST, rustc_then_this_would_need, Whitelisted, template!(List: "DepNode")), |