diff options
| author | bors <bors@rust-lang.org> | 2025-04-20 02:08:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-20 02:08:02 +0000 |
| commit | 49e5e4e3a5610c240a717cb99003a5d5d3356679 (patch) | |
| tree | f7d71ca252f47aa55dedab1ee31180dea2334d98 /compiler/rustc_error_codes | |
| parent | 90fd16eb5be9255006c95e8af12a0d43854dc1a9 (diff) | |
| parent | f0a0efdcdc326cf94d232b8f6f93c8e7ad2809c2 (diff) | |
| download | rust-49e5e4e3a5610c240a717cb99003a5d5d3356679.tar.gz rust-49e5e4e3a5610c240a717cb99003a5d5d3356679.zip | |
Auto merge of #140043 - ChrisDenton:rollup-vwf0s9j, r=ChrisDenton
Rollup of 8 pull requests Successful merges: - #138934 (support config extensions) - #139091 (Rewrite on_unimplemented format string parser.) - #139753 (Make `#[naked]` an unsafe attribute) - #139762 (Don't assemble non-env/bound candidates if projection is rigid) - #139834 (Don't canonicalize crate paths) - #139868 (Move `pal::env` to `std::sys::env_consts`) - #139978 (Add citool command for generating a test dashboard) - #139995 (Clean UI tests 4 of n) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0736.md | 2 | ||||
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0787.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0736.md b/compiler/rustc_error_codes/src/error_codes/E0736.md index cb7633b7068..66d5fbb80cf 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0736.md +++ b/compiler/rustc_error_codes/src/error_codes/E0736.md @@ -11,7 +11,7 @@ Erroneous code example: ```compile_fail,E0736 #[inline] -#[naked] +#[unsafe(naked)] fn foo() {} ``` diff --git a/compiler/rustc_error_codes/src/error_codes/E0787.md b/compiler/rustc_error_codes/src/error_codes/E0787.md index f5c5faa066b..47b56ac17f4 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0787.md +++ b/compiler/rustc_error_codes/src/error_codes/E0787.md @@ -5,7 +5,7 @@ Erroneous code example: ```compile_fail,E0787 #![feature(naked_functions)] -#[naked] +#[unsafe(naked)] pub extern "C" fn f() -> u32 { 42 } |