chore: upgrade Rust to 1.54.0 (#11554)

8 files changed, 35 insertions, 36 deletions

diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs
index 3d25145c1..aae67f87a 100644
--- a/cli/lsp/analysis.rs
+++ b/cli/lsp/analysis.rs
@@ -291,7 +291,7 @@ pub fn parse_module(
   ast::parse_with_source_map(
     &specifier.to_string(),
     source,
-    &media_type,
+    media_type,
     source_map,
   )
 }
@@ -309,7 +309,7 @@ pub fn analyze_dependencies(
 
   // Parse leading comments for supported triple slash references.
   for comment in parsed_module.get_leading_comments().iter() {
-    if let Some((ts_reference, span)) = parse_ts_reference(&comment) {
+    if let Some((ts_reference, span)) = parse_ts_reference(comment) {
       let loc = parsed_module.source_map.lookup_char_pos(span.lo);
       match ts_reference {
         TypeScriptReference::Path(import) => {
@@ -364,7 +364,7 @@ pub fn analyze_dependencies(
     let maybe_resolved_type_dependency =
       // Check for `@deno-types` pragmas that affect the import
       if let Some(comment) = desc.leading_comments.last() {
-        parse_deno_types(&comment).as_ref().map(|(deno_types, span)| {
+        parse_deno_types(comment).as_ref().map(|(deno_types, span)| {
           (
             resolve_import(deno_types, specifier, maybe_import_map),
             deno_types.clone(),
diff --git a/cli/lsp/code_lens.rs b/cli/lsp/code_lens.rs
index 3ad644af3..1f8d2481b 100644
--- a/cli/lsp/code_lens.rs
+++ b/cli/lsp/code_lens.rs
@@ -102,7 +102,7 @@ impl DenoTestCollector {
                       key_value_prop.value.as_ref()
                     {
                       let name = lit_str.value.to_string();
-                      self.add_code_lens(name, &span);
+                      self.add_code_lens(name, span);
                     }
                   }
                 }
@@ -112,7 +112,7 @@ impl DenoTestCollector {
         }
         ast::Expr::Lit(ast::Lit::Str(lit_str)) => {
           let name = lit_str.value.to_string();
-          self.add_code_lens(name, &span);
+          self.add_code_lens(name, span);
         }
         _ => (),
       }
@@ -415,7 +415,7 @@ async fn collect_tsc(
 ) -> Result<Vec<lsp::CodeLens>, AnyError> {
   let workspace_settings = language_server.config.get_workspace_settings();
   let line_index = language_server
-    .get_line_index_sync(&specifier)
+    .get_line_index_sync(specifier)
     .ok_or_else(|| anyhow!("Missing line index."))?;
   let navigation_tree = language_server.get_navigation_tree(specifier).await?;
   let code_lenses = Rc::new(RefCell::new(Vec::new()));
@@ -435,7 +435,7 @@ async fn collect_tsc(
         | tsc::ScriptElementKind::MemberGetAccessorElement
         | tsc::ScriptElementKind::MemberSetAccessorElement => {
           if ABSTRACT_MODIFIER.is_match(&i.kind_modifiers) {
-            code_lenses.push(i.to_code_lens(&line_index, &specifier, &source));
+            code_lenses.push(i.to_code_lens(&line_index, specifier, &source));
           }
         }
         _ => (),
@@ -447,31 +447,31 @@ async fn collect_tsc(
       let source = CodeLensSource::References;
       if let Some(parent) = &mp {
         if parent.kind == tsc::ScriptElementKind::EnumElement {
-          code_lenses.push(i.to_code_lens(&line_index, &specifier, &source));
+          code_lenses.push(i.to_code_lens(&line_index, specifier, &source));
         }
       }
       match i.kind {
         tsc::ScriptElementKind::FunctionElement => {
           if workspace_settings.code_lens.references_all_functions {
-            code_lenses.push(i.to_code_lens(&line_index, &specifier, &source));
+            code_lenses.push(i.to_code_lens(&line_index, specifier, &source));
           }
         }
         tsc::ScriptElementKind::ConstElement
         | tsc::ScriptElementKind::LetElement
         | tsc::ScriptElementKind::VariableElement => {
           if EXPORT_MODIFIER.is_match(&i.kind_modifiers) {
-            code_lenses.push(i.to_code_lens(&line_index, &specifier, &source));
+            code_lenses.push(i.to_code_lens(&line_index, specifier, &source));
           }
         }
         tsc::ScriptElementKind::ClassElement => {
           if i.text != "<class>" {
-            code_lenses.push(i.to_code_lens(&line_index, &specifier, &source));
+            code_lenses.push(i.to_code_lens(&line_index, specifier, &source));
           }
         }
         tsc::ScriptElementKind::InterfaceElement
         | tsc::ScriptElementKind::TypeElement
         | tsc::ScriptElementKind::EnumElement => {
-          code_lenses.push(i.to_code_lens(&line_index, &specifier, &source));
+          code_lenses.push(i.to_code_lens(&line_index, specifier, &source));
         }
         tsc::ScriptElementKind::LocalFunctionElement
         | tsc::ScriptElementKind::MemberGetAccessorElement
@@ -486,7 +486,7 @@ async fn collect_tsc(
                 | tsc::ScriptElementKind::TypeElement => {
                   code_lenses.push(i.to_code_lens(
                     &line_index,
-                    &specifier,
+                    specifier,
                     &source,
                   ));
                 }
diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs
index a7051ddf1..11a4e8364 100644
--- a/cli/lsp/diagnostics.rs
+++ b/cli/lsp/diagnostics.rs
@@ -260,13 +260,13 @@ fn to_lsp_related_information(
         if let (Some(source), Some(start), Some(end)) =
           (&ri.source, &ri.start, &ri.end)
         {
-          let uri = lsp::Url::parse(&source).unwrap();
+          let uri = lsp::Url::parse(source).unwrap();
           Some(lsp::DiagnosticRelatedInformation {
             location: lsp::Location {
               uri,
               range: to_lsp_range(start, end),
             },
-            message: get_diagnostic_message(&ri),
+            message: get_diagnostic_message(ri),
           })
         } else {
           None
@@ -421,8 +421,8 @@ fn diagnose_dependency(
         })
       }
       analysis::ResolvedDependency::Resolved(specifier) => {
-        if !(documents.contains_key(&specifier)
-          || sources.contains_key(&specifier))
+        if !(documents.contains_key(specifier)
+          || sources.contains_key(specifier))
         {
           let (code, message) = match specifier.scheme() {
             "file" => (Some(lsp::NumberOrString::String("no-local".to_string())), format!("Unable to load a local module: \"{}\".\n  Please check the file path.", specifier)),
@@ -439,8 +439,8 @@ fn diagnose_dependency(
             data: Some(json!({ "specifier": specifier })),
             ..Default::default()
           });
-        } else if sources.contains_key(&specifier) {
-          if let Some(message) = sources.get_maybe_warning(&specifier) {
+        } else if sources.contains_key(specifier) {
+          if let Some(message) = sources.get_maybe_warning(specifier) {
             diagnostics.push(lsp::Diagnostic {
               range,
               severity: Some(lsp::DiagnosticSeverity::Warning),
diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs
index 911e30389..c2b207e14 100644
--- a/cli/lsp/documents.rs
+++ b/cli/lsp/documents.rs
@@ -119,13 +119,13 @@ impl DocumentData {
     let mut line_index = if let Some(line_index) = &self.line_index {
       line_index.clone()
     } else {
-      LineIndex::new(&content)
+      LineIndex::new(content)
     };
     let mut index_valid = IndexValid::All;
     for change in content_changes {
       if let Some(range) = change.range {
         if !index_valid.covers(range.start.line) {
-          line_index = LineIndex::new(&content);
+          line_index = LineIndex::new(content);
         }
         index_valid = IndexValid::UpTo(range.start.line);
         let range = line_index.get_text_range(range)?;
@@ -139,7 +139,7 @@ impl DocumentData {
     self.line_index = if index_valid == IndexValid::All {
       Some(line_index)
     } else {
-      Some(LineIndex::new(&content))
+      Some(LineIndex::new(content))
     };
     self.maybe_navigation_tree = None;
     Ok(())
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index ab17d03fb..68ce9c58c 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -620,7 +620,7 @@ impl Inner {
       Ok(maybe_asset.clone())
     } else {
       let maybe_asset =
-        tsc::get_asset(&specifier, &self.ts_server, self.snapshot()?).await?;
+        tsc::get_asset(specifier, &self.ts_server, self.snapshot()?).await?;
       self.assets.insert(specifier.clone(), maybe_asset.clone());
       Ok(maybe_asset)
     }
diff --git a/cli/lsp/registries.rs b/cli/lsp/registries.rs
index d044927bc..6a1dc1a4b 100644
--- a/cli/lsp/registries.rs
+++ b/cli/lsp/registries.rs
@@ -104,7 +104,7 @@ fn get_completor_type(
         if let StringOrNumber::String(name) = &k.name {
           let value = match_result
             .get(name)
-            .map(|s| s.to_string(Some(&k)))
+            .map(|s| s.to_string(Some(k)))
             .unwrap_or_default();
           len += value.chars().count();
           if offset <= len {
@@ -183,14 +183,13 @@ fn validate_config(config: &RegistryConfigurationJson) -> Result<(), AnyError> {
         .collect()
     });
 
-    let variable_names: Vec<String> = registry
-      .variables
-      .iter()
-      .map(|var| var.key.to_owned())
-      .collect();
-
     for key_name in &key_names {
-      if !variable_names.contains(key_name) {
+      if !registry
+        .variables
+        .iter()
+        .map(|var| var.key.to_owned())
+        .any(|x| x == *key_name)
+      {
         return Err(anyhow!("Invalid registry configuration. Registry with schema \"{}\" is missing variable declaration for key \"{}\".", registry.schema, key_name));
       }
     }
diff --git a/cli/lsp/sources.rs b/cli/lsp/sources.rs
index 033a1e9d5..8be1420d4 100644
--- a/cli/lsp/sources.rs
+++ b/cli/lsp/sources.rs
@@ -361,7 +361,7 @@ impl Inner {
     &mut self,
     specifier: &ModuleSpecifier,
   ) -> Option<String> {
-    let metadata = self.get_metadata(&specifier)?;
+    let metadata = self.get_metadata(specifier)?;
     metadata.maybe_warning
   }
 
@@ -399,7 +399,7 @@ impl Inner {
         map_content_type(specifier, maybe_content_type);
       let source = get_source_from_bytes(bytes, maybe_charset).ok()?;
       let maybe_types = headers.get("x-typescript-types").map(|s| {
-        analysis::resolve_import(s, &specifier, &self.maybe_import_map)
+        analysis::resolve_import(s, specifier, &self.maybe_import_map)
       });
       let maybe_warning = headers.get("x-deno-warning").cloned();
       (source, media_type, maybe_types, maybe_warning)
@@ -432,10 +432,10 @@ impl Inner {
   fn get_path(&mut self, specifier: &ModuleSpecifier) -> Option<PathBuf> {
     if specifier.scheme() == "file" {
       specifier.to_file_path().ok()
-    } else if let Some(path) = self.remotes.get(&specifier) {
+    } else if let Some(path) = self.remotes.get(specifier) {
       Some(path.clone())
     } else {
-      let path = self.http_cache.get_cache_filename(&specifier)?;
+      let path = self.http_cache.get_cache_filename(specifier)?;
       if path.is_file() {
         self.remotes.insert(specifier.clone(), path.clone());
         Some(path)
diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs
index 3f52beb6b..c3f82fea8 100644
--- a/cli/lsp/tsc.rs
+++ b/cli/lsp/tsc.rs
@@ -1293,7 +1293,7 @@ impl CallHierarchyOutgoingCall {
       from_ranges: self
         .from_spans
         .iter()
-        .map(|span| span.to_range(&line_index))
+        .map(|span| span.to_range(line_index))
         .collect(),
     })
   }