chore: update to Rust 1.72 (#20258)

<!--
Before submitting a PR, please read https://deno.com/manual/contributing

1. Give the PR a descriptive title.

  Examples of good title:
    - fix(std/http): Fix race condition in server
    - docs(console): Update docstrings
    - feat(doc): Handle nested reexports

  Examples of bad title:
    - fix #7123
    - update docs
    - fix bugs

2. Ensure there is a related issue and it is referenced in the PR text.
3. Ensure there are tests that cover the changes.
4. Ensure `cargo test` passes.
5. Ensure `./tools/format.js` passes without changing files.
6. Ensure `./tools/lint.js` passes.
7. Open as a draft PR if your work is still in progress. The CI won't
run
   all steps, but you can add '[ci]' to a commit message to force it to.
8. If you would like to run the benchmarks on the CI, add the 'ci-bench'
label.
-->

As the title.

---------

Co-authored-by: Matt Mastracci <matthew@mastracci.com>

cli/file_fetcher.rs

@@ -476,7 +476,8 @@ impl FileFetcher {
         let Ok(cache_key) = self.http_cache.cache_item_key(specifier) else {
           return false;
         };
-        let Ok(Some(metadata)) = self.http_cache.read_metadata(&cache_key) else {
+        let Ok(Some(metadata)) = self.http_cache.read_metadata(&cache_key)
+        else {
           return false;
         };
         let cache_semantics = CacheSemantics::new(

cli/lsp/language_server.rs

@@ -1873,7 +1873,7 @@ impl Inner {
             }
             _ => false,
           },
-          "deno-lint" => matches!(&d.code, Some(_)),
+          "deno-lint" => d.code.is_some(),
           "deno" => diagnostics::DenoDiagnostic::is_fixable(d),
           _ => false,
         },

cli/napi/js_native_api.rs

@@ -308,10 +308,9 @@ fn napi_coerce_to_number(
   check_env!(env);
   let env = unsafe { &mut *env };
   let value = napi_value_unchecked(value);
-  let Some(coerced) = value
-    .to_number(&mut env.scope()) else {
-      return napi_number_expected;
-    };
+  let Some(coerced) = value.to_number(&mut env.scope()) else {
+    return napi_number_expected;
+  };
   let value: v8::Local<v8::Value> = coerced.into();
   *result = value.into();
   napi_ok
@@ -1352,10 +1351,9 @@ fn napi_call_function(
 
 #[napi_sym::napi_sym]
 fn napi_close_escapable_handle_scope(
-  env: *mut Env,
+  _env: *mut Env,
   _scope: napi_escapable_handle_scope,
 ) -> napi_status {
-  let mut _env = &mut *(env as *mut Env);
   // TODO: do this properly
   napi_ok
 }
@@ -1365,7 +1363,7 @@ fn napi_close_handle_scope(
   env: *mut Env,
   scope: napi_handle_scope,
 ) -> napi_status {
-  let env = &mut *(env as *mut Env);
+  let env = &mut *env;
   if env.open_handle_scopes == 0 {
     return napi_handle_scope_mismatch;
   }
@@ -1497,7 +1495,7 @@ fn napi_define_class(
       env_ptr,
       *result,
       static_descriptors.len(),
-      static_descriptors.as_ptr() as *const napi_property_descriptor,
+      static_descriptors.as_ptr(),
     ));
   }
 
@@ -1519,7 +1517,8 @@ fn napi_define_properties(
 
   let scope = &mut env.scope();
 
-  let Ok(object) = v8::Local::<v8::Object>::try_from(napi_value_unchecked(obj)) else {
+  let Ok(object) = v8::Local::<v8::Object>::try_from(napi_value_unchecked(obj))
+  else {
     return napi_object_expected;
   };
 
@@ -1614,11 +1613,9 @@ fn napi_delete_property(
   check_arg!(env, result);
 
   let scope = &mut env.scope();
-  let Some(object) = object
-    .map(|o| o.to_object(scope))
-    .flatten() else {
-      return napi_invalid_arg;
-    };
+  let Some(object) = object.map(|o| o.to_object(scope)).flatten() else {
+    return napi_invalid_arg;
+  };
 
   let Some(deleted) = object.delete(scope, key.unwrap_unchecked()) else {
     return napi_generic_failure;
@@ -1630,8 +1627,7 @@ fn napi_delete_property(
 
 // TODO: properly implement ref counting stuff
 #[napi_sym::napi_sym]
-fn napi_delete_reference(env: *mut Env, _nref: napi_ref) -> napi_status {
-  let mut _env = &mut *(env as *mut Env);
+fn napi_delete_reference(_env: *mut Env, _nref: napi_ref) -> napi_status {
   napi_ok
 }
 
@@ -1869,7 +1865,7 @@ fn napi_get_instance_data(
   env: *mut Env,
   result: *mut *mut c_void,
 ) -> napi_status {
-  let env = &mut *(env as *mut Env);
+  let env = &mut *env;
   let shared = env.shared();
   *result = shared.instance_data;
   napi_ok
@@ -2118,11 +2114,9 @@ fn napi_has_own_property(
   check_arg!(env, result);
 
   let scope = &mut env.scope();
-  let Some(object) = object
-    .map(|o| o.to_object(scope))
-    .flatten() else {
-      return napi_invalid_arg;
-    };
+  let Some(object) = object.map(|o| o.to_object(scope)).flatten() else {
+    return napi_invalid_arg;
+  };
 
   if key.is_none() {
     return napi_invalid_arg;
@@ -2131,7 +2125,7 @@ fn napi_has_own_property(
     return napi_name_expected;
   };
 
-  let Some(has_own) =  object.has_own_property(scope, key) else {
+  let Some(has_own) = object.has_own_property(scope, key) else {
     return napi_generic_failure;
   };
 
@@ -2153,11 +2147,9 @@ fn napi_has_property(
   check_arg!(env, result);
 
   let scope = &mut env.scope();
-  let Some(object) = object
-    .map(|o| o.to_object(scope))
-    .flatten() else {
-      return napi_invalid_arg;
-    };
+  let Some(object) = object.map(|o| o.to_object(scope)).flatten() else {
+    return napi_invalid_arg;
+  };
 
   let Some(has) = object.has(scope, key.unwrap_unchecked()) else {
     return napi_generic_failure;
@@ -2180,10 +2172,9 @@ fn napi_instanceof(
 
   let value = napi_value_unchecked(value);
   let constructor = napi_value_unchecked(constructor);
-  let Some(ctor) = constructor
-    .to_object(&mut env.scope()) else {
-      return napi_object_expected;
-    };
+  let Some(ctor) = constructor.to_object(&mut env.scope()) else {
+    return napi_object_expected;
+  };
   if !ctor.is_function() {
     return napi_function_expected;
   }
@@ -2294,8 +2285,7 @@ fn napi_is_error(
 }
 
 #[napi_sym::napi_sym]
-fn napi_is_exception_pending(env: *mut Env, result: *mut bool) -> napi_status {
-  let mut _env = &mut *(env as *mut Env);
+fn napi_is_exception_pending(_env: *mut Env, result: *mut bool) -> napi_status {
   // TODO
   *result = false;
   napi_ok
@@ -2389,7 +2379,7 @@ fn napi_open_handle_scope(
   env: *mut Env,
   _result: *mut napi_handle_scope,
 ) -> napi_status {
-  let env = &mut *(env as *mut Env);
+  let env = &mut *env;
 
   // *result = &mut env.scope() as *mut _ as napi_handle_scope;
   env.open_handle_scopes += 1;
@@ -2525,7 +2515,7 @@ fn napi_set_instance_data(
   finalize_cb: Option<napi_finalize>,
   finalize_hint: *mut c_void,
 ) -> napi_status {
-  let env = &mut *(env as *mut Env);
+  let env = &mut *env;
   let shared = env.shared_mut();
   shared.instance_data = data;
   shared.data_finalize = if finalize_cb.is_some() {
@@ -2567,11 +2557,9 @@ fn napi_set_property(
   check_arg_option!(env, value);
 
   let scope = &mut env.scope();
-  let Some(object) = object
-    .map(|o| o.to_object(scope))
-    .flatten() else {
-      return napi_invalid_arg
-    };
+  let Some(object) = object.map(|o| o.to_object(scope)).flatten() else {
+    return napi_invalid_arg;
+  };
 
   if object
     .set(scope, key.unwrap_unchecked(), value.unwrap_unchecked())
@@ -2759,10 +2747,9 @@ fn napi_unwrap(
   let shared = &*(env.shared as *const EnvShared);
   let napi_wrap = v8::Local::new(&mut env.scope(), &shared.napi_wrap);
   let ext = obj.get_private(&mut env.scope(), napi_wrap).unwrap();
-  let Some(ext) = v8::Local::<v8::External>::try_from(ext)
-    .ok() else {
-      return napi_invalid_arg;
-    };
+  let Some(ext) = v8::Local::<v8::External>::try_from(ext).ok() else {
+    return napi_invalid_arg;
+  };
   *result = ext.value();
   napi_ok
 }

cli/npm/resolvers/global.rs

@@ -100,9 +100,10 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver {
   ) -> Result<PathBuf, AnyError> {
     let Some(referrer_pkg_id) = self
       .cache
-      .resolve_package_folder_id_from_specifier(referrer, &self.registry_url) else {
-        bail!("could not find npm package for '{}'", referrer);
-      };
+      .resolve_package_folder_id_from_specifier(referrer, &self.registry_url)
+    else {
+      bail!("could not find npm package for '{}'", referrer);
+    };
     let pkg = if mode.is_types() && !name.starts_with("@types/") {
       // attempt to resolve the types package first, then fallback to the regular package
       match self.resolve_types_package(name, &referrer_pkg_id) {
@@ -123,10 +124,10 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver {
     &self,
     specifier: &ModuleSpecifier,
   ) -> Result<Option<PathBuf>, AnyError> {
-    let Some(pkg_folder_id) = self.cache.resolve_package_folder_id_from_specifier(
-      specifier,
-      &self.registry_url,
-    ) else {
+    let Some(pkg_folder_id) = self
+      .cache
+      .resolve_package_folder_id_from_specifier(specifier, &self.registry_url)
+    else {
       return Ok(None);
     };
     Ok(Some(

cli/npm/resolvers/local.rs

@@ -110,7 +110,9 @@ impl LocalNpmPackageResolver {
     &self,
     specifier: &ModuleSpecifier,
   ) -> Result<Option<PathBuf>, AnyError> {
-    let Some(relative_url) = self.root_node_modules_url.make_relative(specifier) else {
+    let Some(relative_url) =
+      self.root_node_modules_url.make_relative(specifier)
+    else {
       return Ok(None);
     };
     if relative_url.starts_with("../") {
@@ -230,7 +232,9 @@ impl NpmPackageFsResolver for LocalNpmPackageResolver {
     &self,
     specifier: &ModuleSpecifier,
   ) -> Result<Option<NpmPackageCacheFolderId>, AnyError> {
-    let Some(folder_path) = self.resolve_package_folder_from_specifier(specifier)? else {
+    let Some(folder_path) =
+      self.resolve_package_folder_from_specifier(specifier)?
+    else {
       return Ok(None);
     };
     let folder_name = folder_path.parent().unwrap().to_string_lossy();

cli/npm/resolvers/mod.rs

@@ -135,9 +135,10 @@ impl CliNpmResolver {
   ) -> Result<Option<PathBuf>, AnyError> {
     let Some(path) = self
       .fs_resolver
-      .resolve_package_folder_from_specifier(specifier)? else {
-        return Ok(None);
-      };
+      .resolve_package_folder_from_specifier(specifier)?
+    else {
+      return Ok(None);
+    };
     log::debug!(
       "Resolved package folder of {} to {}",
       specifier,
@@ -153,9 +154,10 @@ impl CliNpmResolver {
   ) -> Result<Option<NpmPackageId>, AnyError> {
     let Some(cache_folder_id) = self
       .fs_resolver
-      .resolve_package_cache_folder_id_from_specifier(specifier)? else {
-        return Ok(None);
-      };
+      .resolve_package_cache_folder_id_from_specifier(specifier)?
+    else {
+      return Ok(None);
+    };
     Ok(Some(
       self
         .resolution

cli/standalone/mod.rs

@@ -183,10 +183,12 @@ impl ModuleLoader for EmbeddedModuleLoader {
       };
     }
 
-    let Some(module) = self.shared.eszip.get_module(original_specifier.as_str()) else {
+    let Some(module) =
+      self.shared.eszip.get_module(original_specifier.as_str())
+    else {
       return Box::pin(deno_core::futures::future::ready(Err(type_error(
         format!("Module not found: {}", original_specifier),
-      ))))
+      ))));
     };
     let original_specifier = original_specifier.clone();
     let found_specifier =

cli/tests/integration/fmt_tests.rs

@@ -266,15 +266,15 @@ fn fmt_with_glob_config() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts"#);
-    assert_contains!(output, r#"glob\pages\[id].ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\bar.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.js"#);
-    assert_contains!(output, r#"glob\nested\foo\bar.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.ts"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts");
+    assert_contains!(output, r"glob\pages\[id].ts");
+    assert_contains!(output, r"glob\nested\fizz\bar.ts");
+    assert_contains!(output, r"glob\nested\foo\foo.ts");
+    assert_contains!(output, r"glob\data\test1.js");
+    assert_contains!(output, r"glob\nested\foo\bar.ts");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts");
+    assert_contains!(output, r"glob\data\test1.ts");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts");
     assert_contains!(output, "glob/pages/[id].ts");
@@ -303,15 +303,15 @@ fn fmt_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts"#);
-    assert_contains!(output, r#"glob\pages\[id].ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\bazz.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.js"#);
-    assert_contains!(output, r#"glob\nested\foo\bazz.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.ts"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts");
+    assert_contains!(output, r"glob\pages\[id].ts");
+    assert_contains!(output, r"glob\nested\fizz\bazz.ts");
+    assert_contains!(output, r"glob\nested\foo\foo.ts");
+    assert_contains!(output, r"glob\data\test1.js");
+    assert_contains!(output, r"glob\nested\foo\bazz.ts");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts");
+    assert_contains!(output, r"glob\data\test1.ts");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts");
     assert_contains!(output, "glob/pages/[id].ts");
@@ -333,8 +333,8 @@ fn fmt_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\data\test1.js"#);
-    assert_contains!(output, r#"glob\data\test1.ts"#);
+    assert_contains!(output, r"glob\data\test1.js");
+    assert_contains!(output, r"glob\data\test1.ts");
   } else {
     assert_contains!(output, "glob/data/test1.js");
     assert_contains!(output, "glob/data/test1.ts");

cli/tests/integration/lint_tests.rs

@@ -131,15 +131,15 @@ fn lint_with_glob_config() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\pages\[id].ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\bar.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.js:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\bar.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.ts:1:10"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts:1:10");
+    assert_contains!(output, r"glob\pages\[id].ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\bar.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.js:1:10");
+    assert_contains!(output, r"glob\nested\foo\bar.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.ts:1:10");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts:1:10");
     assert_contains!(output, "glob/pages/[id].ts:1:10");
@@ -168,15 +168,15 @@ fn lint_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\pages\[id].ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\bazz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.js:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\bazz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.ts:1:10"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts:1:10");
+    assert_contains!(output, r"glob\pages\[id].ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\bazz.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.js:1:10");
+    assert_contains!(output, r"glob\nested\foo\bazz.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.ts:1:10");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts:1:10");
     assert_contains!(output, "glob/pages/[id].ts:1:10");
@@ -200,8 +200,8 @@ fn lint_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\data\test1.js:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.ts:1:10"#);
+    assert_contains!(output, r"glob\data\test1.js:1:10");
+    assert_contains!(output, r"glob\data\test1.ts:1:10");
   } else {
     assert_contains!(output, "glob/data/test1.js:1:10");
     assert_contains!(output, "glob/data/test1.ts:1:10");

cli/tests/integration/lsp_tests.rs

@@ -3685,7 +3685,7 @@ fn lsp_find_references() {
       "uri": "file:///a/mod.ts",
       "languageId": "typescript",
       "version": 1,
-      "text": r#"export const a = 1;\nconst b = 2;"#
+      "text": r"export const a = 1;\nconst b = 2;"
     }
   }));
   client.did_open(json!({

cli/tests/integration/repl_tests.rs

@@ -242,7 +242,7 @@ fn pty_internal_repl() {
 fn pty_emoji() {
   // windows was having issues displaying this
   util::with_pty(&["repl"], |mut console| {
-    console.write_line(r#"console.log('\u{1F995}');"#);
+    console.write_line(r"console.log('\u{1F995}');");
     console.expect("🦕");
   });
 }

cli/tools/coverage/merge.rs

@@ -229,7 +229,7 @@ impl<'a> Iterator for StartEventQueue<'a> {
               let mut result = self.queue.next().unwrap();
               if pending_offset == queue_offset {
                 let pending_trees = self.pending.take().unwrap().trees;
-                result.trees.extend(pending_trees.into_iter())
+                result.trees.extend(pending_trees)
               }
               Some(result)
             }
@@ -338,7 +338,7 @@ fn merge_range_tree_children<'a>(
 
   let child_forests: Vec<Vec<&'a mut RangeTree<'a>>> = flat_children
     .into_iter()
-    .zip(wrapped_children.into_iter())
+    .zip(wrapped_children)
     .map(|(flat, wrapped)| merge_children_lists(flat, wrapped))
     .collect();
 

cli/util/v8.rs

@@ -16,7 +16,7 @@ pub fn construct_v8_flags(
 ) -> Vec<String> {
   std::iter::once("UNUSED_BUT_NECESSARY_ARG0".to_owned())
     .chain(default_v8_flags.iter().cloned())
-    .chain(env_v8_flags.into_iter())
+    .chain(env_v8_flags)
     .chain(v8_flags.iter().cloned())
     .collect::<Vec<_>>()
 }

cli/worker.rs

@@ -507,11 +507,13 @@ impl CliMainWorkerFactory {
       return Ok(None);
     }
 
-    let Some(resolution) = self.shared.node_resolver.resolve_npm_req_reference(
-      package_ref,
-      NodeResolutionMode::Execution,
-      permissions,
-    )? else {
+    let Some(resolution) =
+      self.shared.node_resolver.resolve_npm_req_reference(
+        package_ref,
+        NodeResolutionMode::Execution,
+        permissions,
+      )?
+    else {
       return Ok(None);
     };
     match &resolution {