From d849f5c2259ae6b5d2c11e42ff4b78f303a9d909 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Tue, 5 Mar 2024 11:54:37 +1100 Subject: [PATCH] Disable `tests/ui-fulldeps/internal-lints/diagnostics.rs` on stage 1. When you make a change to the diagnostic lints, it uses the old version of the lints with stage 1 and the new version with stage 2, which often leads to failures in stage 1. Let's just stick to stage 2. --- tests/ui-fulldeps/internal-lints/diagnostics.rs | 1 + .../ui-fulldeps/internal-lints/diagnostics.stderr | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/ui-fulldeps/internal-lints/diagnostics.rs b/tests/ui-fulldeps/internal-lints/diagnostics.rs index 8dcc34d4f60..fb1dcf7a6bf 100644 --- a/tests/ui-fulldeps/internal-lints/diagnostics.rs +++ b/tests/ui-fulldeps/internal-lints/diagnostics.rs @@ -1,4 +1,5 @@ //@ compile-flags: -Z unstable-options +//@ ignore-stage1 #![crate_type = "lib"] #![feature(rustc_attrs)] diff --git a/tests/ui-fulldeps/internal-lints/diagnostics.stderr b/tests/ui-fulldeps/internal-lints/diagnostics.stderr index 1b1ad7d5892..5ddfdf32149 100644 --- a/tests/ui-fulldeps/internal-lints/diagnostics.stderr +++ b/tests/ui-fulldeps/internal-lints/diagnostics.stderr @@ -1,41 +1,41 @@ error: diagnostics should be created using translatable messages - --> $DIR/diagnostics.rs:42:9 + --> $DIR/diagnostics.rs:43:9 | LL | Diag::new(dcx, level, "untranslatable diagnostic") | ^^^^^^^^^ | note: the lint level is defined here - --> $DIR/diagnostics.rs:6:9 + --> $DIR/diagnostics.rs:7:9 | LL | #![deny(rustc::untranslatable_diagnostic)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: diagnostics should be created using translatable messages - --> $DIR/diagnostics.rs:63:14 + --> $DIR/diagnostics.rs:64:14 | LL | diag.note("untranslatable diagnostic"); | ^^^^ error: diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls - --> $DIR/diagnostics.rs:81:21 + --> $DIR/diagnostics.rs:82:21 | LL | let _diag = dcx.struct_err(crate::fluent_generated::no_crate_example); | ^^^^^^^^^^ | note: the lint level is defined here - --> $DIR/diagnostics.rs:7:9 + --> $DIR/diagnostics.rs:8:9 | LL | #![deny(rustc::diagnostic_outside_of_impl)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls - --> $DIR/diagnostics.rs:84:21 + --> $DIR/diagnostics.rs:85:21 | LL | let _diag = dcx.struct_err("untranslatable diagnostic"); | ^^^^^^^^^^ error: diagnostics should be created using translatable messages - --> $DIR/diagnostics.rs:84:21 + --> $DIR/diagnostics.rs:85:21 | LL | let _diag = dcx.struct_err("untranslatable diagnostic"); | ^^^^^^^^^^