From 1fc09befdc73ccf2bae3435a5f1cb6230ed0844c Mon Sep 17 00:00:00 2001 From: Daria Sukhonina Date: Mon, 8 Jun 2026 16:20:16 +0300 Subject: [PATCH] Relax test requirements for consistency --- .../force_warn_expected_lints_fulfilled.rs | 5 +---- .../force_warn_expected_lints_fulfilled.stderr | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs index 3b8cbe99a65e3..7a3e4fa77531c 100644 --- a/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs +++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs @@ -2,12 +2,11 @@ //@ compile-flags: --force-warn unused_variables //@ compile-flags: --force-warn unused_mut //@ check-pass -//@ ignore-parallel-frontend `note`s on different source lines + fn expect_early_pass_lint() { #[expect(while_true)] while true { //~^ WARNING denote infinite loops with `loop { ... }` [while_true] - //~| NOTE requested on the command line with `--force-warn while-true` //~| HELP use `loop` println!("I never stop") } @@ -17,7 +16,6 @@ fn expect_early_pass_lint() { fn check_specific_lint() { let x = 2; //~^ WARNING unused variable: `x` [unused_variables] - //~| NOTE requested on the command line with `--force-warn unused-variables` //~| HELP if this is intentional, prefix it with an underscore } @@ -29,7 +27,6 @@ fn check_multiple_lints_with_lint_group() { let mut what_does_the_fox_say = "*ding* *deng* *dung*"; //~^ WARNING variable does not need to be mutable [unused_mut] - //~| NOTE requested on the command line with `--force-warn unused-mut` //~| HELP remove this `mut` println!("The fox says: {what_does_the_fox_say}"); diff --git a/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr index dbfdfc7d4fa7a..60ab04f1498c0 100644 --- a/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr +++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr @@ -7,7 +7,7 @@ LL | while true { = note: requested on the command line with `--force-warn while-true` warning: unused variable: `x` - --> $DIR/force_warn_expected_lints_fulfilled.rs:18:9 + --> $DIR/force_warn_expected_lints_fulfilled.rs:17:9 | LL | let x = 2; | ^ help: if this is intentional, prefix it with an underscore: `_x` @@ -15,7 +15,7 @@ LL | let x = 2; = note: requested on the command line with `--force-warn unused-variables` warning: variable does not need to be mutable - --> $DIR/force_warn_expected_lints_fulfilled.rs:30:9 + --> $DIR/force_warn_expected_lints_fulfilled.rs:28:9 | LL | let mut what_does_the_fox_say = "*ding* *deng* *dung*"; | ----^^^^^^^^^^^^^^^^^^^^^ @@ -25,13 +25,13 @@ LL | let mut what_does_the_fox_say = "*ding* *deng* *dung*"; = note: requested on the command line with `--force-warn unused-mut` warning: unused variable: `fox_name` - --> $DIR/force_warn_expected_lints_fulfilled.rs:26:9 + --> $DIR/force_warn_expected_lints_fulfilled.rs:24:9 | LL | let fox_name = "Sir Nibbles"; | ^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_fox_name` warning: unused variable: `this_should_fulfill_the_expectation` - --> $DIR/force_warn_expected_lints_fulfilled.rs:41:9 + --> $DIR/force_warn_expected_lints_fulfilled.rs:38:9 | LL | let this_should_fulfill_the_expectation = "The `#[allow]` has no power here"; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_this_should_fulfill_the_expectation`