about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuri Astrakhan <YuriAstrakhan@gmail.com>2024-09-27 23:48:00 -0400
committerYuri Astrakhan <YuriAstrakhan@gmail.com>2024-09-28 19:51:02 -0400
commitf7d5d9d892ea8affb3e3fb4e30241300ba7b63f7 (patch)
treea724b5a3a9e7a4e6c3efa0f9737b2e0bb74367cc /src
parent7b566c214e701f93ddeedd5b60ea1290a9e8aa36 (diff)
downloadrust-f7d5d9d892ea8affb3e3fb4e30241300ba7b63f7.tar.gz
rust-f7d5d9d892ea8affb3e3fb4e30241300ba7b63f7.zip
Convert `&Option<T>` to `Option<&T>`
Diffstat (limited to 'src')
-rw-r--r--src/driver.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/driver.rs b/src/driver.rs
index afd9df6c0fc..c66837dc998 100644
--- a/src/driver.rs
+++ b/src/driver.rs
@@ -74,11 +74,11 @@ fn test_has_arg() {
     assert!(!has_arg(args, "--bar"));
 }
 
-fn track_clippy_args(psess: &mut ParseSess, args_env_var: &Option<String>) {
-    psess.env_depinfo.get_mut().insert((
-        Symbol::intern("CLIPPY_ARGS"),
-        args_env_var.as_deref().map(Symbol::intern),
-    ));
+fn track_clippy_args(psess: &mut ParseSess, args_env_var: Option<&str>) {
+    psess
+        .env_depinfo
+        .get_mut()
+        .insert((Symbol::intern("CLIPPY_ARGS"), args_env_var.map(Symbol::intern)));
 }
 
 /// Track files that may be accessed at runtime in `file_depinfo` so that cargo will re-run clippy
@@ -122,7 +122,7 @@ impl rustc_driver::Callbacks for RustcCallbacks {
     fn config(&mut self, config: &mut interface::Config) {
         let clippy_args_var = self.clippy_args_var.take();
         config.psess_created = Some(Box::new(move |psess| {
-            track_clippy_args(psess, &clippy_args_var);
+            track_clippy_args(psess, clippy_args_var.as_deref());
         }));
     }
 }
@@ -139,7 +139,7 @@ impl rustc_driver::Callbacks for ClippyCallbacks {
         let previous = config.register_lints.take();
         let clippy_args_var = self.clippy_args_var.take();
         config.psess_created = Some(Box::new(move |psess| {
-            track_clippy_args(psess, &clippy_args_var);
+            track_clippy_args(psess, clippy_args_var.as_deref());
             track_files(psess);
 
             // Trigger a rebuild if CLIPPY_CONF_DIR changes. The value must be a valid string so