Rustc, Adapter: Address PR comments

Author: xFrednet

marker_adapter/src/lib.rs

@@ -7,10 +7,7 @@
 pub mod context;
 mod loader;
 
-use std::{
-    cell::{RefCell, RefMut},
-    ops::ControlFlow,
-};
+use std::{cell::RefCell, ops::ControlFlow};
 
 use loader::LintCrateRegistry;
 use marker_api::{
@@ -56,17 +53,13 @@ impl Adapter {
     }
 
     pub fn process_krate<'ast>(&self, cx: &'ast AstContext<'ast>, krate: &Crate<'ast>) {
-        // `RefMut::map` is used to get a *pure* mutable reference, which can
-        // then be used in the visitor. It might not be super pretty, but it works :)
-        RefMut::map(self.inner.borrow_mut(), |inner| {
-            inner.external_lint_crates.set_ast_context(cx);
+        let inner = &mut *self.inner.borrow_mut();
 
-            for item in krate.items() {
-                visitor::traverse_item::<()>(cx, inner, *item);
-            }
+        inner.external_lint_crates.set_ast_context(cx);
 
-            inner
-        });
+        for item in krate.items() {
+            visitor::traverse_item::<()>(cx, inner, *item);
+        }
     }
 }
 

marker_lints/src/lib.rs

@@ -18,11 +18,11 @@ marker_api::declare_lint!(
 );
 
 #[derive(Debug, Default)]
-struct MarkerLintPass;
+struct MarkerLintsLintPass;
 
-marker_api::export_lint_pass!(MarkerLintPass);
+marker_api::export_lint_pass!(MarkerLintsLintPass);
 
-impl LintPass for MarkerLintPass {
+impl LintPass for MarkerLintsLintPass {
     fn info(&self) -> LintPassInfo {
         LintPassInfoBuilder::new(Box::new([DIAG_MSG_UPPERCASE_START])).build()
     }

marker_rustc_driver/src/lint_pass.rs

@@ -9,7 +9,7 @@ thread_local! {
     /// The [`Adapter`] loads the lint crates and is the general interface used
     /// by drivers to communicate with lint crates.
     ///
-    /// The lint crates have to be loaded before the instantiation of [`MarkerLintPass`]
+    /// The lint crates have to be loaded before the instantiation of [`RustcLintPass`]
     /// to allow this driver to register the lints before the lint pass starts.
     /// (See [`super::MarkerCallback::config`]). Storing the `Adapter` in a `thread_local`
     /// cell is the easiest solution I could come up with. It should be fine performance
@@ -23,24 +23,24 @@ thread_local! {
     });
 }
 
-pub struct MarkerLintPass;
+pub struct RustcLintPass;
 
-impl MarkerLintPass {
+impl RustcLintPass {
     pub fn marker_lints() -> Vec<&'static Lint> {
         ADAPTER.with(|adapter| {
-            let mut rustc_lints = vec![];
-            for info in adapter.lint_pass_infos() {
-                rustc_lints.extend_from_slice(info.lints());
-            }
-
-            rustc_lints
+            adapter
+                .lint_pass_infos()
+                .iter()
+                .flat_map(marker_api::LintPassInfo::lints)
+                .copied()
+                .collect()
         })
     }
 }
 
-rustc_lint_defs::impl_lint_pass!(MarkerLintPass => []);
+rustc_lint_defs::impl_lint_pass!(RustcLintPass => []);
 
-impl<'tcx> rustc_lint::LateLintPass<'tcx> for MarkerLintPass {
+impl<'tcx> rustc_lint::LateLintPass<'tcx> for RustcLintPass {
     fn check_crate(&mut self, rustc_cx: &rustc_lint::LateContext<'tcx>) {
         ADAPTER.with(|adapter| {
             process_crate(rustc_cx, adapter);

marker_rustc_driver/src/main.rs

@@ -60,13 +60,13 @@ impl rustc_driver::Callbacks for MarkerCallback {
         config.register_lints = Some(Box::new(|_sess, lint_store| {
             // Register lints from lint crates. This is required to have rustc track
             // the lint level correctly.
-            let lints: Vec<_> = lint_pass::MarkerLintPass::marker_lints()
+            let lints: Vec<_> = lint_pass::RustcLintPass::marker_lints()
                 .into_iter()
                 .map(RustcConverter::static_to_lint)
                 .collect();
             lint_store.register_lints(&lints);
 
-            lint_store.register_late_pass(|_| Box::new(lint_pass::MarkerLintPass));
+            lint_store.register_late_pass(|_| Box::new(lint_pass::RustcLintPass));
         }));
     }
 }