From f11edf7611402fedffb0e32ab0981406185fc079 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Wed, 11 Dec 2024 19:30:33 +0300
Subject: [PATCH 1/2] allow `symbol_intern_string_literal` lint in test modules
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
compiler/rustc_ast/src/util/comments/tests.rs | 2 ++
compiler/rustc_hir/src/tests.rs | 2 ++
compiler/rustc_lint/src/tests.rs | 2 ++
compiler/rustc_parse/src/parser/tests.rs | 2 ++
compiler/rustc_parse/src/parser/tokenstream/tests.rs | 2 ++
compiler/rustc_span/src/edit_distance/tests.rs | 2 ++
6 files changed, 12 insertions(+)
diff --git a/compiler/rustc_ast/src/util/comments/tests.rs b/compiler/rustc_ast/src/util/comments/tests.rs
index 61bb2468e79b9..f88b534a0c114 100644
--- a/compiler/rustc_ast/src/util/comments/tests.rs
+++ b/compiler/rustc_ast/src/util/comments/tests.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(bootstrap), allow(rustc::symbol_intern_string_literal))]
+
use rustc_span::create_default_session_globals_then;
use super::*;
diff --git a/compiler/rustc_hir/src/tests.rs b/compiler/rustc_hir/src/tests.rs
index 5c10fa4697156..953e48a6d3347 100644
--- a/compiler/rustc_hir/src/tests.rs
+++ b/compiler/rustc_hir/src/tests.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(bootstrap), allow(rustc::symbol_intern_string_literal))]
+
use rustc_data_structures::stable_hasher::Hash64;
use rustc_span::def_id::{DefPathHash, StableCrateId};
use rustc_span::edition::Edition;
diff --git a/compiler/rustc_lint/src/tests.rs b/compiler/rustc_lint/src/tests.rs
index 7fbf381a8d321..186dec5904b49 100644
--- a/compiler/rustc_lint/src/tests.rs
+++ b/compiler/rustc_lint/src/tests.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(bootstrap), allow(rustc::symbol_intern_string_literal))]
+
use rustc_span::{Symbol, create_default_session_globals_then};
use crate::levels::parse_lint_and_tool_name;
diff --git a/compiler/rustc_parse/src/parser/tests.rs b/compiler/rustc_parse/src/parser/tests.rs
index decaecd2682ce..1813960dad05f 100644
--- a/compiler/rustc_parse/src/parser/tests.rs
+++ b/compiler/rustc_parse/src/parser/tests.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(bootstrap), allow(rustc::symbol_intern_string_literal))]
+
use std::assert_matches::assert_matches;
use std::io::prelude::*;
use std::iter::Peekable;
diff --git a/compiler/rustc_parse/src/parser/tokenstream/tests.rs b/compiler/rustc_parse/src/parser/tokenstream/tests.rs
index efe266f529057..b13b68c266a0e 100644
--- a/compiler/rustc_parse/src/parser/tokenstream/tests.rs
+++ b/compiler/rustc_parse/src/parser/tokenstream/tests.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(bootstrap), allow(rustc::symbol_intern_string_literal))]
+
use rustc_ast::token::{self, IdentIsRaw};
use rustc_ast::tokenstream::{TokenStream, TokenTree};
use rustc_span::{BytePos, Span, Symbol, create_default_session_globals_then};
diff --git a/compiler/rustc_span/src/edit_distance/tests.rs b/compiler/rustc_span/src/edit_distance/tests.rs
index c9c7a1f1bf2f6..9540f934d7ebe 100644
--- a/compiler/rustc_span/src/edit_distance/tests.rs
+++ b/compiler/rustc_span/src/edit_distance/tests.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(bootstrap), allow(rustc::symbol_intern_string_literal))]
+
use super::*;
#[test]
From 12684456d39504cdc696ddd3f3b741480a215476 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Wed, 11 Dec 2024 19:42:48 +0300
Subject: [PATCH 2/2] remove `Kind` check for `symbol_intern_string_literal`
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/src/core/builder/cargo.rs | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index 38abca8b8da17..226b7e2f232e8 100644
--- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -1035,12 +1035,7 @@ impl Builder<'_> {
rustflags.arg("-Wrustc::internal");
// cfg(bootstrap) - remove this check when lint is in bootstrap compiler
if stage != 0 {
- // Lint is allow by default so downstream tools don't get a lit
- // they can do nothing about
- // We shouldn't be preinterning symbols used by tests
- if cmd_kind != Kind::Test {
- rustflags.arg("-Drustc::symbol_intern_string_literal");
- }
+ rustflags.arg("-Drustc::symbol_intern_string_literal");
}
// FIXME(edition_2024): Change this to `-Wrust_2024_idioms` when all
// of the individual lints are satisfied.