Prepare for WIP PR opening

Author: blyxyas

.gitignore

@@ -30,7 +30,7 @@ Session.vim
 !/tests/run-make/thumb-none-qemu/example/.cargo
 
 ## Configuration
-config.toml
+/config.toml
 /Makefile
 config.mk
 config.stamp

compiler/rustc_builtin_macros/src/compile_error.rs

@@ -18,8 +18,8 @@ pub(crate) fn expand_compile_error<'cx>(
         Err(guar) => return ExpandResult::Ready(DummyResult::any(sp, guar)),
     };
 
-    // #[expect(rustc::diagnostic_outside_of_impl, reason = "diagnostic message is specified by user")]
-    // #[expect(rustc::untranslatable_diagnostic, reason = "diagnostic message is specified by user")]
+    #[expect(rustc::diagnostic_outside_of_impl, reason = "diagnostic message is specified by user")]
+    #[expect(rustc::untranslatable_diagnostic, reason = "diagnostic message is specified by user")]
     let guar = cx.dcx().span_err(sp, var.to_string());
 
     ExpandResult::Ready(DummyResult::any(sp, guar))

compiler/rustc_builtin_macros/src/errors.rs

@@ -428,10 +428,10 @@ pub(crate) struct EnvNotDefinedWithUserMessage {
 impl<'a, G: EmissionGuarantee> Diagnostic<'a, G> for EnvNotDefinedWithUserMessage {
     #[track_caller]
     fn into_diag(self, dcx: &'a DiagCtxt, level: Level) -> Diag<'a, G> {
-        // #[expect(
-        //     rustc::untranslatable_diagnostic,
-        //     reason = "cannot translate user-provided messages"
-        // )]
+        #[expect(
+            rustc::untranslatable_diagnostic,
+            reason = "cannot translate user-provided messages"
+        )]
         let mut diag = Diag::new(dcx, level, self.msg_from_user.to_string());
         diag.span(self.span);
         diag

compiler/rustc_lint/src/late.rs

@@ -376,7 +376,9 @@ pub fn late_lint_mod<'tcx, T: LateLintPass<'tcx> + 'tcx>(
         // let lints_to_emit = &lints_that_can_emit.0;
         // let lints_allowed = &lints_that_can_emit.1;
 
-        // Now, we'll filtered passes in a way that discards any lint that
+        // Now, we'll filtered passes in a way that discards any lint that won't trigger.
+        // If any lint is a given pass is detected to be emitted, we will keep that pass.
+        // Otherwise, we don't
         let mut filtered_passes: Vec<Box<dyn LateLintPass<'tcx>>> = passes
             .into_iter()
             .filter(|pass| {
@@ -390,17 +392,6 @@ pub fn late_lint_mod<'tcx, T: LateLintPass<'tcx> + 'tcx>(
                         || (!lints_allowed.contains(&lint_name)
                             && lint.default_level != crate::Level::Allow)
                 })
-                // if passes_lints[i].iter().any(|&lint| {
-                //     let symbol =
-                //         &lint.name.to_lowercase()
-                //             // Doing some calculations here to account for those separators
-                //             [lint.name.find("::").unwrap_or(lint.name.len() - 2) + 2..]
-
-                //     // ^^^ Expensive, but more expensive would be having to
-                //     // cast every element to &str
-
-                //         (!lints_allowed.contains(&lint.name)
-                //             && lint.default_level != crate::Level::Allow)
             })
             .collect();
 

compiler/rustc_lint/src/levels.rs

@@ -520,53 +520,6 @@ impl<'tcx> LintLevelMinimum<'tcx> {
     }
 }
 
-// impl<'tcx> Visitor<'tcx> for LintLevelMinimum<'tcx> {
-//     type NestedFilter = nested_filter::All;
-
-//     fn nested_visit_map(&mut self) -> Self::Map {
-//         self.tcx.hir()
-//     }
-
-//     fn visit_attribute(&mut self, attribute: &'tcx ast::Attribute) {
-//         if let Some(meta) = attribute.meta() {
-//             if [sym::warn, sym::deny, sym::forbid, sym::expect]
-//                 .iter()
-//                 .any(|kind| meta.has_name(*kind))
-//             {
-//                 // SAFETY: Lint attributes are always a metalist inside a
-//                 // metalist (even with just one lint).
-//                 for meta_list in meta.meta_item_list().unwrap() {
-//                     // If it's a tool lint (e.g. clippy::my_clippy_lint)
-//                     if let ast::NestedMetaItem::MetaItem(meta_item) = meta_list {
-//                         if meta_item.path.segments.len() == 1 {
-//                             self.lints_to_emit.push(
-//                                 // SAFETY: Lint attributes can only have literals
-//                                 meta_list.ident().unwrap().name,
-//                             );
-//                         } else {
-//                             self.lints_to_emit.push(meta_item.path.segments[1].ident.name);
-//                         }
-//                     }
-//                 }
-//             // We handle #![allow]s differently, as these remove checking rather than adding.
-//             } else if meta.has_name(sym::allow)
-//                 && let ast::AttrStyle::Inner = attribute.style
-//             {
-//                 for meta_list in meta.meta_item_list().unwrap() {
-//                     // If it's a tool lint (e.g. clippy::my_clippy_lint)
-//                     if let ast::NestedMetaItem::MetaItem(meta_item) = meta_list {
-//                         if meta_item.path.segments.len() == 1 {
-//                             self.lints_allowed.push(meta_list.name_or_empty())
-//                         } else {
-//                             self.lints_allowed.push(meta_item.path.segments[1].ident.name);
-//                         }
-//                     }
-//                 }
-//             }
-//         }
-//     }
-// }
-
 pub struct LintLevelsBuilder<'s, P> {
     sess: &'s Session,
     features: &'s Features,

compiler/rustc_parse/src/parser/attr.rs

@@ -139,7 +139,7 @@ impl<'a> Parser<'a> {
             && let Some(meta) = attr.meta()
         {
             if let Some(first) = meta.path.segments.first() {
-                if [sym::warn, sym::deny, sym::forbid]
+                if [sym::warn, sym::deny, sym::forbid, sym::expect]
                     .iter()
                     .any(|symbol| first.ident.name == *symbol)
                 {