Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 336e89b

Browse files
committedJul 12, 2024
Auto merge of rust-lang#127665 - workingjubilee:rollup-g90yr21, r=workingjubilee
Rollup of 11 pull requests Successful merges: - rust-lang#126502 (Ignore allocation bytes in some mir-opt tests) - rust-lang#126922 (add lint for inline asm labels that look like binary) - rust-lang#127209 (Added the `xop` target-feature and the `xop_target_feature` feature gate) - rust-lang#127310 (Fix import suggestion ice) - rust-lang#127338 (Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake) - rust-lang#127381 (Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake) - rust-lang#127535 (Fire unsafe_code lint on unsafe extern blocks) - rust-lang#127619 (Suggest using precise capturing for hidden type that captures region) - rust-lang#127631 (Remove `fully_normalize`) - rust-lang#127632 (Implement `precise_capturing` support for rustdoc) - rust-lang#127660 (Rename the internal `const_strlen` to just `strlen`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c6727fc + 8f8734c commit 336e89b

File tree

140 files changed

+1288
-690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1288
-690
lines changed
 

‎compiler/rustc_interface/src/tests.rs

+1
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ fn test_unstable_options_tracking_hash() {
691691
untracked!(dump_mir, Some(String::from("abc")));
692692
untracked!(dump_mir_dataflow, true);
693693
untracked!(dump_mir_dir, String::from("abc"));
694+
untracked!(dump_mir_exclude_alloc_bytes, true);
694695
untracked!(dump_mir_exclude_pass_number, true);
695696
untracked!(dump_mir_graphviz, true);
696697
untracked!(dump_mono_stats, SwitchWithOptPath::Enabled(Some("mono-items-dir/".into())));

‎compiler/rustc_lint/messages.ftl

+15-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ lint_builtin_allow_internal_unsafe =
5252
lint_builtin_anonymous_params = anonymous parameters are deprecated and will be removed in the next edition
5353
.suggestion = try naming the parameter or explicitly ignoring it
5454
55-
lint_builtin_asm_labels = avoid using named labels in inline assembly
56-
.help = only local labels of the form `<number>:` should be used in inline asm
57-
.note = see the asm section of Rust By Example <https://doc.rust-lang.org/nightly/rust-by-example/unsafe/asm.html#labels> for more information
58-
5955
lint_builtin_clashing_extern_diff_name = `{$this}` redeclares `{$orig}` with a different signature
6056
.previous_decl_label = `{$orig}` previously declared here
6157
.mismatch_label = this signature doesn't match the previous declaration
@@ -163,6 +159,8 @@ lint_builtin_unreachable_pub = unreachable `pub` {$what}
163159
164160
lint_builtin_unsafe_block = usage of an `unsafe` block
165161
162+
lint_builtin_unsafe_extern_block = usage of an `unsafe extern` block
163+
166164
lint_builtin_unsafe_impl = implementation of an `unsafe` trait
167165
168166
lint_builtin_unsafe_trait = declaration of an `unsafe` trait
@@ -403,6 +401,19 @@ lint_incomplete_include =
403401
404402
lint_inner_macro_attribute_unstable = inner macro attributes are unstable
405403
404+
lint_invalid_asm_label_binary = avoid using labels containing only the digits `0` and `1` in inline assembly
405+
.label = use a different label that doesn't start with `0` or `1`
406+
.note = an LLVM bug makes these labels ambiguous with a binary literal number
407+
.note = see <https://bugs.llvm.org/show_bug.cgi?id=36144> for more information
408+
409+
lint_invalid_asm_label_format_arg = avoid using named labels in inline assembly
410+
.help = only local labels of the form `<number>:` should be used in inline asm
411+
.note1 = format arguments may expand to a non-numeric value
412+
.note2 = see the asm section of Rust By Example <https://doc.rust-lang.org/nightly/rust-by-example/unsafe/asm.html#labels> for more information
413+
lint_invalid_asm_label_named = avoid using named labels in inline assembly
414+
.help = only local labels of the form `<number>:` should be used in inline asm
415+
.note = see the asm section of Rust By Example <https://doc.rust-lang.org/nightly/rust-by-example/unsafe/asm.html#labels> for more information
416+
lint_invalid_asm_label_no_span = the label may be declared in the expansion of a macro
406417
lint_invalid_crate_type_value = invalid `crate_type` value
407418
.suggestion = did you mean
408419
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.