Auto merge of rust-lang#124617 - GuillaumeGomez:rollup-eihxh6v, r=GuillaumeGomez

bors · bors · commit 9382ba471607 · 2024-05-02T13:58:22.000Z
Rollup of 3 pull requests Successful merges: - rust-lang#124568 (Adjust `#[macro_export]`/doctest help suggestion for non_local_defs lint) - rust-lang#124582 (always print nice 'std not found' error when std is not found) - rust-lang#124597 (Use an explicit x86-64 cpu in tests that are sensitive to it) r? `@ghost` `@rustbot` modify labels: rollup
diff --git a/compiler/rustc_lint/messages.ftl b/compiler/rustc_lint/messages.ftl
@@ -456,6 +456,8 @@ lint_non_local_definitions_macro_rules = non-local `macro_rules!` definition, th
             [one] `{$body_name}`
            *[other] `{$body_name}` and up {$depth} bodies
         }
+    .help_doctest =
+        remove the `#[macro_export]` or make this doc-test a standalone test with its own `fn main() {"{"} ... {"}"}`
     .non_local = a `macro_rules!` definition is non-local if it is nested inside an item and has a `#[macro_export]` attribute
     .exception = one exception to the rule are anon-const (`const _: () = {"{"} ... {"}"}`) at top-level module
 
diff --git a/compiler/rustc_lint/src/lints.rs b/compiler/rustc_lint/src/lints.rs
@@ -1350,14 +1350,18 @@ pub enum NonLocalDefinitionsDiag {
         const_anon: Option<Span>,
     },
     #[diag(lint_non_local_definitions_macro_rules)]
-    #[help]
-    #[note(lint_non_local)]
-    #[note(lint_exception)]
-    #[note(lint_non_local_definitions_deprecation)]
     MacroRules {
         depth: u32,
         body_kind_descr: &'static str,
         body_name: String,
+        #[help]
+        help: Option<()>,
+        #[help(lint_help_doctest)]
+        doctest_help: Option<()>,
+        #[note(lint_non_local)]
+        #[note(lint_exception)]
+        #[note(lint_non_local_definitions_deprecation)]
+        notes: (),
         #[subdiagnostic]
         cargo_update: Option<NonLocalDefinitionsCargoUpdateNote>,
     },
diff --git a/compiler/rustc_lint/src/non_local_def.rs b/compiler/rustc_lint/src/non_local_def.rs
@@ -233,6 +233,12 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
             ItemKind::Macro(_macro, MacroKind::Bang)
                 if cx.tcx.has_attr(item.owner_id.def_id, sym::macro_export) =>
             {
+                // determining we if are in a doctest context can't currently be determined
+                // by the code it-self (no specific attrs), but fortunatly rustdoc sets a
+                // perma-unstable env for libtest so we just re-use that env for now
+                let is_at_toplevel_doctest =
+                    self.body_depth == 2 && std::env::var("UNSTABLE_RUSTDOC_TEST_PATH").is_ok();
+
                 cx.emit_span_lint(
                     NON_LOCAL_DEFINITIONS,
                     item.span,
@@ -243,6 +249,9 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
                             .map(|s| s.to_ident_string())
                             .unwrap_or_else(|| "<unnameable>".to_string()),
                         cargo_update: cargo_update(),
+                        help: (!is_at_toplevel_doctest).then_some(()),
+                        doctest_help: is_at_toplevel_doctest.then_some(()),
+                        notes: (),
                     },
                 )
             }
diff --git a/compiler/rustc_metadata/src/errors.rs b/compiler/rustc_metadata/src/errors.rs
@@ -5,7 +5,6 @@ use std::{
 
 use rustc_errors::{codes::*, Diag, DiagCtxt, Diagnostic, EmissionGuarantee, Level};
 use rustc_macros::{Diagnostic, Subdiagnostic};
-use rustc_session::config;
 use rustc_span::{sym, Span, Symbol};
 use rustc_target::spec::{PanicStrategy, TargetTriple};
 
@@ -640,9 +639,7 @@ impl<G: EmissionGuarantee> Diagnostic<'_, G> for CannotFindCrate {
         diag.arg("locator_triple", self.locator_triple.triple());
         diag.code(E0463);
         diag.span(self.span);
-        if (self.crate_name == sym::std || self.crate_name == sym::core)
-            && self.locator_triple != TargetTriple::from_triple(config::host_triple())
-        {
+        if self.crate_name == sym::std || self.crate_name == sym::core {
             if self.missing_core {
                 diag.note(fluent::metadata_target_not_installed);
             } else {
diff --git a/tests/assembly/simd-intrinsic-mask-reduce.rs b/tests/assembly/simd-intrinsic-mask-reduce.rs
@@ -1,6 +1,8 @@
 // verify that simd mask reductions do not introduce additional bit shift operations
 //@ revisions: x86 aarch64
 //@ [x86] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel
+// Set the base cpu explicitly, in case the default has been changed.
+//@ [x86] compile-flags: -C target-cpu=x86-64
 //@ [x86] needs-llvm-components: x86
 //@ [aarch64] compile-flags: --target=aarch64-unknown-linux-gnu
 //@ [aarch64] needs-llvm-components: aarch64
diff --git a/tests/assembly/x86_64-floating-point-clamp.rs b/tests/assembly/x86_64-floating-point-clamp.rs
@@ -2,7 +2,8 @@
 // so check to make sure that's what it's actually emitting.
 
 //@ assembly-output: emit-asm
-//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel
+// Set the base cpu explicitly, in case the default has been changed.
+//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel -C target-cpu=x86-64
 //@ only-x86_64
 //@ ignore-sgx
 
diff --git a/tests/codegen/target-feature-inline-closure.rs b/tests/codegen/target-feature-inline-closure.rs
@@ -1,5 +1,6 @@
 //@ only-x86_64
-//@ compile-flags: -Copt-level=3
+// Set the base cpu explicitly, in case the default has been changed.
+//@ compile-flags: -Copt-level=3 -Ctarget-cpu=x86-64
 
 #![crate_type = "lib"]
 #![feature(target_feature_11)]
diff --git a/tests/rustdoc-ui/doctest/non_local_defs.rs b/tests/rustdoc-ui/doctest/non_local_defs.rs
@@ -0,0 +1,10 @@
+//@ check-pass
+//@ compile-flags:--test --test-args --test-threads=1 --nocapture -Zunstable-options
+//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
+//@ normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
+//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
+
+//! ```
+//! #[macro_export]
+//! macro_rules! a_macro { () => {} }
+//! ```
diff --git a/tests/rustdoc-ui/doctest/non_local_defs.stderr b/tests/rustdoc-ui/doctest/non_local_defs.stderr
@@ -0,0 +1,14 @@
+warning: non-local `macro_rules!` definition, they should be avoided as they go against expectation
+  --> $DIR/non_local_defs.rs:9:1
+   |
+LL | macro_rules! a_macro { () => {} }
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = help: remove the `#[macro_export]` or make this doc-test a standalone test with its own `fn main() { ... }`
+   = note: a `macro_rules!` definition is non-local if it is nested inside an item and has a `#[macro_export]` attribute
+   = note: one exception to the rule are anon-const (`const _: () = { ... }`) at top-level module
+   = note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
+   = note: `#[warn(non_local_definitions)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/tests/rustdoc-ui/doctest/non_local_defs.stdout b/tests/rustdoc-ui/doctest/non_local_defs.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/non_local_defs.rs - (line 7) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/ui/asm/x86_64/target-feature-attr.rs b/tests/ui/asm/x86_64/target-feature-attr.rs
@@ -1,4 +1,6 @@
 //@ only-x86_64
+// Set the base cpu explicitly, in case the default has been changed.
+//@ compile-flags: -C target-cpu=x86-64
 
 #![feature(avx512_target_feature)]
 
diff --git a/tests/ui/asm/x86_64/target-feature-attr.stderr b/tests/ui/asm/x86_64/target-feature-attr.stderr
@@ -1,23 +1,23 @@
 error: register class `ymm_reg` requires the `avx` target feature
-  --> $DIR/target-feature-attr.rs:18:40
+  --> $DIR/target-feature-attr.rs:20:40
    |
 LL |     asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
    |                                        ^^^^^^^^^^^^^
 
 error: register class `ymm_reg` requires the `avx` target feature
-  --> $DIR/target-feature-attr.rs:18:55
+  --> $DIR/target-feature-attr.rs:20:55
    |
 LL |     asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
    |                                                       ^^^^^^^^^^^^^
 
 error: register class `ymm_reg` requires the `avx` target feature
-  --> $DIR/target-feature-attr.rs:18:70
+  --> $DIR/target-feature-attr.rs:20:70
    |
 LL |     asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
    |                                                                      ^^^^^^^^^^^^^^^^^^
 
 error: register class `kreg` requires at least one of the following target features: avx512bw, avx512f
-  --> $DIR/target-feature-attr.rs:33:23
+  --> $DIR/target-feature-attr.rs:35:23
    |
 LL |     asm!("/* {0} */", in(kreg) x);
    |                       ^^^^^^^^^^
diff --git a/tests/ui/consts/const-eval/const_fn_target_feature.rs b/tests/ui/consts/const-eval/const_fn_target_feature.rs
@@ -1,5 +1,6 @@
 //@ only-x86_64
-//@ compile-flags:-C target-feature=+ssse3
+// Set the base cpu explicitly, in case the default has been changed.
+//@ compile-flags: -C target-cpu=x86-64 -C target-feature=+ssse3
 
 #![crate_type = "lib"]
 
diff --git a/tests/ui/consts/const-eval/const_fn_target_feature.stderr b/tests/ui/consts/const-eval/const_fn_target_feature.stderr
@@ -1,5 +1,5 @@
 error[E0080]: evaluation of constant value failed
-  --> $DIR/const_fn_target_feature.rs:10:24
+  --> $DIR/const_fn_target_feature.rs:11:24
    |
 LL | const B: () = unsafe { avx2_fn() };
    |                        ^^^^^^^^^ calling a function that requires unavailable target features: avx2
diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
@@ -1,4 +1,6 @@
 //@ only-x86_64
+// Set the base cpu explicitly, in case the default has been changed.
+//@ compile-flags: -C target-cpu=x86-64
 
 #![feature(target_feature_11)]
 
diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr
@@ -1,5 +1,5 @@
 error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:25:5
+  --> $DIR/safe-calls.rs:27:5
    |
 LL |     sse2();
    |     ^^^^^^ call to function with `#[target_feature]`
@@ -8,39 +8,39 @@ LL |     sse2();
    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
 
 error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:27:5
+  --> $DIR/safe-calls.rs:29:5
    |
 LL |     avx_bmi2();
    |     ^^^^^^^^^^ call to function with `#[target_feature]`
    |
    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
 
 error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:29:5
+  --> $DIR/safe-calls.rs:31:5
    |
 LL |     Quux.avx_bmi2();
    |     ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
    |
    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
 
 error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:35:5
+  --> $DIR/safe-calls.rs:37:5
    |
 LL |     avx_bmi2();
    |     ^^^^^^^^^^ call to function with `#[target_feature]`
    |
    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
 
 error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:37:5
+  --> $DIR/safe-calls.rs:39:5
    |
 LL |     Quux.avx_bmi2();
    |     ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
    |
    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
 
 error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:43:5
+  --> $DIR/safe-calls.rs:45:5
    |
 LL |     sse2();
    |     ^^^^^^ call to function with `#[target_feature]`
@@ -49,23 +49,23 @@ LL |     sse2();
    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
 
 error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:45:5
+  --> $DIR/safe-calls.rs:47:5
    |
 LL |     avx_bmi2();
    |     ^^^^^^^^^^ call to function with `#[target_feature]`
    |
    = help: in order for the call to be safe, the context requires the following additional target feature: bmi2
 
 error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:47:5
+  --> $DIR/safe-calls.rs:49:5
    |
 LL |     Quux.avx_bmi2();
    |     ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
    |
    = help: in order for the call to be safe, the context requires the following additional target feature: bmi2
 
 error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:54:5
+  --> $DIR/safe-calls.rs:56:5
    |
 LL |     sse2();
    |     ^^^^^^ call to function with `#[target_feature]`
@@ -74,7 +74,7 @@ LL |     sse2();
    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
 
 error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:58:15
+  --> $DIR/safe-calls.rs:60:15
    |
 LL | const _: () = sse2();
    |               ^^^^^^ call to function with `#[target_feature]`
@@ -83,7 +83,7 @@ LL | const _: () = sse2();
    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
 
 error[E0133]: call to function `sse2_and_fxsr` with `#[target_feature]` is unsafe and requires unsafe function or block
-  --> $DIR/safe-calls.rs:61:15
+  --> $DIR/safe-calls.rs:63:15
    |
 LL | const _: () = sse2_and_fxsr();
    |               ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
@@ -92,7 +92,7 @@ LL | const _: () = sse2_and_fxsr();
    = note: the fxsr and sse2 target features being enabled in the build configuration does not remove the requirement to list them in `#[target_feature]`
 
 error: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe block (error E0133)
-  --> $DIR/safe-calls.rs:68:5
+  --> $DIR/safe-calls.rs:70:5
    |
 LL |     sse2();
    |     ^^^^^^ call to function with `#[target_feature]`
@@ -101,12 +101,12 @@ LL |     sse2();
    = help: in order for the call to be safe, the context requires the following additional target feature: sse2
    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
 note: an unsafe function restricts its caller, but its body is safe by default
-  --> $DIR/safe-calls.rs:67:1
+  --> $DIR/safe-calls.rs:69:1
    |
 LL | unsafe fn needs_unsafe_block() {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: the lint level is defined here
-  --> $DIR/safe-calls.rs:64:8
+  --> $DIR/safe-calls.rs:66:8
    |
 LL | #[deny(unsafe_op_in_unsafe_fn)]
    |        ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/sse2.rs b/tests/ui/sse2.rs
@@ -19,7 +19,7 @@ fn main() {
         assert!(cfg!(target_feature = "sse2"),
                 "SSE2 was not detected as available on an x86 platform");
     }
-    // check a negative case too -- allowed on x86, but not enabled by default
-    assert!(cfg!(not(target_feature = "avx2")),
-            "AVX2 shouldn't be detected as available by default on any platform");
+    // check a negative case too -- certainly not enabled by default
+    assert!(cfg!(not(target_feature = "ferris_wheel")),
+            "🎡 shouldn't be detected as available by default on any platform");
 }

Original file line number	Diff line number	Diff line change
@@ -456,6 +456,8 @@ lint_non_local_definitions_macro_rules = non-local `macro_rules!` definition, th
`456`	`456`	[one] `{$body_name}`
`457`	`457`	*[other] `{$body_name}` and up {$depth} bodies
`458`	`458`	`}`
	`459`	`+ .help_doctest =`
	`460`	+ remove the `#[macro_export]` or make this doc-test a standalone test with its own `fn main() {"{"} ... {"}"}`
`459`	`461`	.non_local = a `macro_rules!` definition is non-local if it is nested inside an item and has a `#[macro_export]` attribute
`460`	`462`	.exception = one exception to the rule are anon-const (`const _: () = {"{"} ... {"}"}`) at top-level module
`461`	`463`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0080]: evaluation of constant value failed`
`2`		`- --> $DIR/const_fn_target_feature.rs:10:24`
	`2`	`+ --> $DIR/const_fn_target_feature.rs:11:24`
`3`	`3`	`\|`
`4`	`4`	`LL \| const B: () = unsafe { avx2_fn() };`
`5`	`5`	`\| ^^^^^^^^^ calling a function that requires unavailable target features: avx2`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
`2`		`- --> $DIR/safe-calls.rs:25:5`
	`2`	`+ --> $DIR/safe-calls.rs:27:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| sse2();`
`5`	`5`	\| ^^^^^^ call to function with `#[target_feature]`
`@@ -8,39 +8,39 @@ LL \| sse2();`
`8`	`8`	= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
`9`	`9`
`10`	`10`	error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
`11`		`- --> $DIR/safe-calls.rs:27:5`
	`11`	`+ --> $DIR/safe-calls.rs:29:5`
`12`	`12`	`\|`
`13`	`13`	`LL \| avx_bmi2();`
`14`	`14`	\| ^^^^^^^^^^ call to function with `#[target_feature]`
`15`	`15`	`\|`
`16`	`16`	`= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2`
`17`	`17`
`18`	`18`	error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
`19`		`- --> $DIR/safe-calls.rs:29:5`
	`19`	`+ --> $DIR/safe-calls.rs:31:5`
`20`	`20`	`\|`
`21`	`21`	`LL \| Quux.avx_bmi2();`
`22`	`22`	\| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
`23`	`23`	`\|`
`24`	`24`	`= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2`
`25`	`25`
`26`	`26`	error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
`27`		`- --> $DIR/safe-calls.rs:35:5`
	`27`	`+ --> $DIR/safe-calls.rs:37:5`
`28`	`28`	`\|`
`29`	`29`	`LL \| avx_bmi2();`
`30`	`30`	\| ^^^^^^^^^^ call to function with `#[target_feature]`
`31`	`31`	`\|`
`32`	`32`	`= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2`
`33`	`33`
`34`	`34`	error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
`35`		`- --> $DIR/safe-calls.rs:37:5`
	`35`	`+ --> $DIR/safe-calls.rs:39:5`
`36`	`36`	`\|`
`37`	`37`	`LL \| Quux.avx_bmi2();`
`38`	`38`	\| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
`39`	`39`	`\|`
`40`	`40`	`= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2`
`41`	`41`
`42`	`42`	error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
`43`		`- --> $DIR/safe-calls.rs:43:5`
	`43`	`+ --> $DIR/safe-calls.rs:45:5`
`44`	`44`	`\|`
`45`	`45`	`LL \| sse2();`
`46`	`46`	\| ^^^^^^ call to function with `#[target_feature]`
`@@ -49,23 +49,23 @@ LL \| sse2();`
`49`	`49`	= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
`50`	`50`
`51`	`51`	error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
`52`		`- --> $DIR/safe-calls.rs:45:5`
	`52`	`+ --> $DIR/safe-calls.rs:47:5`
`53`	`53`	`\|`
`54`	`54`	`LL \| avx_bmi2();`
`55`	`55`	\| ^^^^^^^^^^ call to function with `#[target_feature]`
`56`	`56`	`\|`
`57`	`57`	`= help: in order for the call to be safe, the context requires the following additional target feature: bmi2`
`58`	`58`
`59`	`59`	error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
`60`		`- --> $DIR/safe-calls.rs:47:5`
	`60`	`+ --> $DIR/safe-calls.rs:49:5`
`61`	`61`	`\|`
`62`	`62`	`LL \| Quux.avx_bmi2();`
`63`	`63`	\| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
`64`	`64`	`\|`
`65`	`65`	`= help: in order for the call to be safe, the context requires the following additional target feature: bmi2`
`66`	`66`
`67`	`67`	error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
`68`		`- --> $DIR/safe-calls.rs:54:5`
	`68`	`+ --> $DIR/safe-calls.rs:56:5`
`69`	`69`	`\|`
`70`	`70`	`LL \| sse2();`
`71`	`71`	\| ^^^^^^ call to function with `#[target_feature]`
`@@ -74,7 +74,7 @@ LL \| sse2();`
`74`	`74`	= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
`75`	`75`
`76`	`76`	error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
`77`		`- --> $DIR/safe-calls.rs:58:15`
	`77`	`+ --> $DIR/safe-calls.rs:60:15`
`78`	`78`	`\|`
`79`	`79`	`LL \| const _: () = sse2();`
`80`	`80`	\| ^^^^^^ call to function with `#[target_feature]`
`@@ -83,7 +83,7 @@ LL \| const _: () = sse2();`
`83`	`83`	= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
`84`	`84`
`85`	`85`	error[E0133]: call to function `sse2_and_fxsr` with `#[target_feature]` is unsafe and requires unsafe function or block
`86`		`- --> $DIR/safe-calls.rs:61:15`
	`86`	`+ --> $DIR/safe-calls.rs:63:15`
`87`	`87`	`\|`
`88`	`88`	`LL \| const _: () = sse2_and_fxsr();`
`89`	`89`	\| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
`@@ -92,7 +92,7 @@ LL \| const _: () = sse2_and_fxsr();`
`92`	`92`	= note: the fxsr and sse2 target features being enabled in the build configuration does not remove the requirement to list them in `#[target_feature]`
`93`	`93`
`94`	`94`	error: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe block (error E0133)
`95`		`- --> $DIR/safe-calls.rs:68:5`
	`95`	`+ --> $DIR/safe-calls.rs:70:5`
`96`	`96`	`\|`
`97`	`97`	`LL \| sse2();`
`98`	`98`	\| ^^^^^^ call to function with `#[target_feature]`
`@@ -101,12 +101,12 @@ LL \| sse2();`
`101`	`101`	`= help: in order for the call to be safe, the context requires the following additional target feature: sse2`
`102`	`102`	= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
`103`	`103`	`note: an unsafe function restricts its caller, but its body is safe by default`
`104`		`- --> $DIR/safe-calls.rs:67:1`
	`104`	`+ --> $DIR/safe-calls.rs:69:1`
`105`	`105`	`\|`
`106`	`106`	`LL \| unsafe fn needs_unsafe_block() {`
`107`	`107`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`108`	`108`	`note: the lint level is defined here`
`109`		`- --> $DIR/safe-calls.rs:64:8`
	`109`	`+ --> $DIR/safe-calls.rs:66:8`
`110`	`110`	`\|`
`111`	`111`	`LL \| #[deny(unsafe_op_in_unsafe_fn)]`
`112`	`112`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ fn main() {`
`19`	`19`	`assert!(cfg!(target_feature = "sse2"),`
`20`	`20`	`"SSE2 was not detected as available on an x86 platform");`
`21`	`21`	`}`
`22`		`- // check a negative case too -- allowed on x86, but not enabled by default`
`23`		`- assert!(cfg!(not(target_feature = "avx2")),`
`24`		`- "AVX2 shouldn't be detected as available by default on any platform");`
	`22`	`+ // check a negative case too -- certainly not enabled by default`
	`23`	`+ assert!(cfg!(not(target_feature = "ferris_wheel")),`
	`24`	`+ "🎡 shouldn't be detected as available by default on any platform");`
`25`	`25`	`}`