diff options
| author | bors <bors@rust-lang.org> | 2024-08-14 06:43:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-14 06:43:26 +0000 |
| commit | fbce03b195c02e425fbb12276b8f02349048a75f (patch) | |
| tree | bb206c0661ae531d01421b5d556da4b65828e786 /compiler/rustc_feature/src | |
| parent | 9859bf27fd9892f48725c59b56aeee2be1d2fbad (diff) | |
| parent | 24a46c57aebd3a51cae4edc028f06390520c2b71 (diff) | |
| download | rust-fbce03b195c02e425fbb12276b8f02349048a75f.tar.gz rust-fbce03b195c02e425fbb12276b8f02349048a75f.zip | |
Auto merge of #129060 - matthiaskrgr:rollup-s72gpif, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #122884 (Optimize integer `pow` by removing the exit branch) - #127857 (Allow to customize `// TODO:` comment for deprecated safe autofix) - #129034 (Add `#[must_use]` attribute to `Coroutine` trait) - #129049 (compiletest: Don't panic on unknown JSON-like output lines) - #129050 (Emit a warning instead of an error if `--generate-link-to-definition` is used with other output formats than HTML) - #129056 (Fix one usage of target triple in bootstrap) - #129058 (Add mw back to review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_feature/src')
| -rw-r--r-- | compiler/rustc_feature/src/builtin_attrs.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs index 72ea55d5999..d593f05c8c6 100644 --- a/compiler/rustc_feature/src/builtin_attrs.rs +++ b/compiler/rustc_feature/src/builtin_attrs.rs @@ -643,8 +643,8 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ through unstable paths" ), rustc_attr!( - rustc_deprecated_safe_2024, Normal, template!(Word), WarnFollowing, - EncodeCrossCrate::Yes, + rustc_deprecated_safe_2024, Normal, template!(List: r#"audit_that = "...""#), + ErrorFollowing, EncodeCrossCrate::Yes, "rustc_deprecated_safe_2024 is supposed to be used in libstd only", ), |
