chore: upgrade Rust to 1.53.0 (denoland#11021)

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
  - name: Install rust
  uses: hecrj/setup-rust-action@v1
  with:
- rust-version: 1.52.1
+ rust-version: 1.53.0
 
  - name: Install clippy and rustfmt
  if: matrix.kind == 'lint'

cli/bench/main.rs

@@ -439,7 +439,7 @@ struct BenchResult {
  we replace the harness with our own runner here.
 */
 fn main() -> Result<()> {
- if env::args().find(|s| s == "--bench").is_none() {
+ if !env::args().any(|s| s == "--bench") {
  return Ok(());
  }
 

cli/disk_cache.rs

@@ -170,12 +170,12 @@ mod tests {
  let mut cache_location = temp_dir.path().to_owned();
  assert!(fs::remove_dir(&cache_location).is_ok());
  cache_location.push("foo");
- assert_eq!(cache_location.is_dir(), false);
+ assert!(!cache_location.is_dir());
  let cache = DiskCache::new(&cache_location);
  cache
  .ensure_dir_exists(&cache.location)
  .expect("Testing expect:");
- assert_eq!(cache_location.is_dir(), true);
+ assert!(cache_location.is_dir());
  }
 
  #[test]

cli/lsp/language_server.rs

@@ -504,7 +504,7 @@ impl Inner {
  specifier: &ModuleSpecifier,
  ) -> Result<Option<AssetDocument>, AnyError> {
  if let Some(maybe_asset) = self.assets.get(specifier) {
- return Ok(maybe_asset.clone());
+ Ok(maybe_asset.clone())
  } else {
  let maybe_asset =
  tsc::get_asset(&specifier, &self.ts_server, self.snapshot()?).await?;

cli/specifier_handler.rs

@@ -670,15 +670,15 @@ pub mod tests {
  .unwrap();
  let cached_module: CachedModule =
  file_fetcher.fetch(specifier, None, false).await.unwrap();
- assert_eq!(cached_module.is_remote, true);
+ assert!(cached_module.is_remote);
  let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
  let specifier = resolve_url_or_path(
  c.join("tests/subdir/mod1.ts").as_os_str().to_str().unwrap(),
  )
  .unwrap();
  let cached_module: CachedModule =
  file_fetcher.fetch(specifier, None, false).await.unwrap();
- assert_eq!(cached_module.is_remote, false);
+ assert!(!cached_module.is_remote);
  }
 
  #[tokio::test]
@@ -716,7 +716,7 @@ pub mod tests {
  assert_eq!(actual.requested_specifier, specifier);
  assert_eq!(actual.specifier, specifier);
  assert_eq!(actual.media_type, MediaType::TypeScript);
- assert_eq!(actual.is_remote, false);
+ assert!(!actual.is_remote);
 
  let specifier = resolve_url_or_path("file:https:///b.ts").unwrap();
  let actual: CachedModule = handler
@@ -727,7 +727,7 @@ pub mod tests {
  assert_eq!(actual.requested_specifier, specifier);
  assert_eq!(actual.specifier, specifier);
  assert_eq!(actual.media_type, MediaType::TypeScript);
- assert_eq!(actual.is_remote, false);
+ assert!(!actual.is_remote);
 
  let specifier = resolve_url_or_path("https://deno.land/x/c.js").unwrap();
  let actual: CachedModule = handler
@@ -738,7 +738,7 @@ pub mod tests {
  assert_eq!(actual.requested_specifier, specifier);
  assert_eq!(actual.specifier, specifier);
  assert_eq!(actual.media_type, MediaType::JavaScript);
- assert_eq!(actual.is_remote, true);
+ assert!(actual.is_remote);
 
  let specifier = resolve_url_or_path("https://deno.land/x/d.d.ts").unwrap();
  let actual: CachedModule = handler
@@ -749,7 +749,7 @@ pub mod tests {
  assert_eq!(actual.requested_specifier, specifier);
  assert_eq!(actual.specifier, specifier);
  assert_eq!(actual.media_type, MediaType::Dts);
- assert_eq!(actual.is_remote, true);
+ assert!(actual.is_remote);
 
  let specifier =
  resolve_url_or_path("https://deno.land/x/missing.ts").unwrap();
@@ -767,7 +767,7 @@ pub mod tests {
  assert_eq!(actual.requested_specifier, specifier);
  assert_eq!(actual.specifier, specifier);
  assert_eq!(actual.media_type, MediaType::TypeScript);
- assert_eq!(actual.is_remote, false);
+ assert!(!actual.is_remote);
 
  let specifier = resolve_url_or_path("file:https:///C:/a.ts").unwrap();
  let actual: CachedModule = handler
@@ -778,6 +778,6 @@ pub mod tests {
  assert_eq!(actual.requested_specifier, specifier);
  assert_eq!(actual.specifier, specifier);
  assert_eq!(actual.media_type, MediaType::TypeScript);
- assert_eq!(actual.is_remote, false);
+ assert!(!actual.is_remote);
  }
 }

core/async_cancel.rs

@@ -644,10 +644,10 @@ mod tests {
  }
  }
 
- assert_eq!(futures.into_iter().any(|fut| !fut.is_terminated()), false);
+ assert!(!futures.into_iter().any(|fut| !fut.is_terminated()));
 
  let cancel_handles = [cancel_now, cancel_at_0, cancel_at_1, cancel_at_4];
- assert_eq!(cancel_handles.iter().any(|c| !c.is_canceled()), false);
+ assert!(!cancel_handles.iter().any(|c| !c.is_canceled()));
  }
 
  #[tokio::test]

core/bindings.rs

@@ -206,7 +206,7 @@ pub extern "C" fn host_import_module_dynamically_callback(
  if arg.is_native_error() {
  let message = v8::Exception::create_message(scope, arg);
  if message.get_stack_trace(scope).unwrap().get_frame_count() == 0 {
- let arg: v8::Local<v8::Object> = arg.clone().try_into().unwrap();
+ let arg: v8::Local<v8::Object> = arg.try_into().unwrap();
  let message_key = v8::String::new(scope, "message").unwrap();
  let message = arg.get(scope, message_key.into()).unwrap();
  let exception =

core/error.rs

@@ -191,8 +191,7 @@ impl JsError {
 
  let (message, frames, stack) = if exception.is_native_error() {
  // The exception is a JS Error object.
- let exception: v8::Local<v8::Object> =
- exception.clone().try_into().unwrap();
+ let exception: v8::Local<v8::Object> = exception.try_into().unwrap();
 
  let e: NativeJsError =
  serde_v8::from_v8(scope, exception.into()).unwrap();

runtime/ops/io.rs

@@ -429,7 +429,7 @@ impl StdFileResource {
  .borrow_mut()
  .await;
  let nwritten = fs_file.0.as_mut().unwrap().read(buf).await?;
- return Ok(nwritten);
+ Ok(nwritten)
  } else {
  Err(resource_unavailable())
  }
@@ -442,7 +442,7 @@ impl StdFileResource {
  .await;
  let nwritten = fs_file.0.as_mut().unwrap().write(buf).await?;
  fs_file.0.as_mut().unwrap().flush().await?;
- return Ok(nwritten);
+ Ok(nwritten)
  } else {
  Err(resource_unavailable())
  }

runtime/web_worker.rs

@@ -408,8 +408,7 @@ impl WebWorker {
  // If `None` is returned it means that runtime was destroyed before
  // evaluation was complete. This can happen in Web Worker when `self.close()`
  // is called at top level.
- let result = maybe_result.unwrap_or(Ok(()));
- return result;
+ maybe_result.unwrap_or(Ok(()))
  }
 
  event_loop_result = self.run_event_loop(false) => {
@@ -418,8 +417,7 @@ impl WebWorker {
  }
  event_loop_result?;
  let maybe_result = receiver.next().await;
- let result = maybe_result.unwrap_or(Ok(()));
- return result;
+ maybe_result.unwrap_or(Ok(()))
  }
  }
  }

runtime/worker.rs

@@ -215,15 +215,13 @@ impl MainWorker {
  tokio::select! {
  maybe_result = receiver.next() => {
  debug!("received module evaluate {:#?}", maybe_result);
- let result = maybe_result.expect("Module evaluation result not provided.");
- return result;
+ maybe_result.expect("Module evaluation result not provided.")
  }
 
  event_loop_result = self.run_event_loop(false) => {
  event_loop_result?;
  let maybe_result = receiver.next().await;
- let result = maybe_result.expect("Module evaluation result not provided.");
- return result;
+ maybe_result.expect("Module evaluation result not provided.")
  }
  }
  }

test_util/src/lib.rs

@@ -298,11 +298,9 @@ async fn get_tls_config(
  })
  .unwrap();
 
- return Ok(Arc::new(config));
- }
- None => {
- return Err(io::Error::new(io::ErrorKind::Other, "Cannot find key"));
+ Ok(Arc::new(config))
  }
+ None => Err(io::Error::new(io::ErrorKind::Other, "Cannot find key")),
  }
 }
 
@@ -369,7 +367,7 @@ async fn absolute_redirect(
 
  let file = tokio::fs::read(file_path).await.unwrap();
  let file_resp = custom_headers(req.uri().path(), file);
- return Ok(file_resp);
+ Ok(file_resp)
 }
 
 async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {