chore: upgrade to Rust 1.59 (denoland#13767)

.github/workflows/ci.yml

@@ -259,7 +259,7 @@ jobs:
  ~/.cargo/registry/index
  ~/.cargo/registry/cache
  ~/.cargo/git/db
- key: 3-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
+ key: 4-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
 
  # In main branch, always creates fresh cache
  - name: Cache build output (main)
@@ -275,7 +275,7 @@ jobs:
  !./target/*/*.zip
  !./target/*/*.tar.gz
  key: |
- 3-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
+ 4-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
 
  # Restore cache from the latest 'main' branch build.
  - name: Cache build output (PR)
@@ -291,7 +291,7 @@ jobs:
  !./target/*/*.tar.gz
  key: never_saved
  restore-keys: |
- 3-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
+ 4-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
 
  # Don't save cache after building PRs or branches other than 'main'.
  - name: Skip save cache (PR)

cli/Cargo.toml

@@ -75,7 +75,6 @@ libc = "=0.2.106"
 log = { version = "=0.4.14", features = ["serde"] }
 lspower = "=1.4.0"
 notify = "=5.0.0-pre.12"
-num_cpus = "=1.13.0"
 once_cell = "=1.9.0"
 percent-encoding = "=2.1.0"
 pin-project = "=1.0.8"

cli/cache.rs

@@ -198,8 +198,7 @@ impl Cacher for FetchCacher {
  .disk_cache
  .get(&filename)
  .ok()
- .map(|b| String::from_utf8(b).ok())
- .flatten()
+ .and_then(|b| String::from_utf8(b).ok())
  }
 
  fn set(

cli/compat/esm_resolver.rs

@@ -549,7 +549,7 @@ fn resolve_package_target_string(
 
  if invalid_segment_re.is_match(&subpath) {
  let request = if pattern {
- match_.replace("*", &subpath)
+ match_.replace('*', &subpath)
  } else {
  format!("{}{}", match_, subpath)
  };

cli/compat/mod.rs

@@ -138,7 +138,7 @@ pub(crate) fn add_global_require(
 }
 
 fn escape_for_single_quote_string(text: &str) -> String {
- text.replace(r"\", r"\\").replace("'", r"\'")
+ text.replace('\\', r"\\").replace('\'', r"\'")
 }
 
 pub fn setup_builtin_modules(

cli/config_file.rs

@@ -614,8 +614,7 @@ impl ConfigFile {
  .json
  .compiler_options
  .as_ref()
- .map(|co| co.get("checkJs").map(|v| v.as_bool()).flatten())
- .flatten()
+ .and_then(|co| co.get("checkJs").and_then(|v| v.as_bool()))
  .unwrap_or(false)
  }
 

cli/disk_cache.rs

@@ -91,7 +91,7 @@ impl DiskCache {
  | Prefix::VerbatimUNC(server, share) => {
  out.push("UNC");
  let host = Host::parse(server.to_str().unwrap()).unwrap();
- let host = host.to_string().replace(":", "_");
+ let host = host.to_string().replace(':', "_");
  out.push(host);
  out.push(share);
  }

cli/flags.rs

@@ -2232,8 +2232,8 @@ fn test_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
  if let Some(value) = matches.value_of("jobs") {
  value.parse().unwrap()
  } else {
- // TODO(caspervonb) drop the dependency on num_cpus when https://doc.rust-lang.org/std/thread/fn.available_concurrency.html becomes stable.
- NonZeroUsize::new(num_cpus::get()).unwrap()
+ std::thread::available_parallelism()
+  .unwrap_or(NonZeroUsize::new(1).unwrap())
  }
  } else {
  NonZeroUsize::new(1).unwrap()

cli/lsp/cache.rs

@@ -61,13 +61,10 @@ impl CacheServer {
  .unwrap();
  let maybe_import_map_resolver =
  maybe_import_map.map(ImportMapResolver::new);
- let maybe_jsx_resolver = maybe_config_file
- .as_ref()
- .map(|cf| {
- cf.to_maybe_jsx_import_source_module()
- .map(|im| JsxResolver::new(im, maybe_import_map_resolver.clone()))
- })
- .flatten();
+ let maybe_jsx_resolver = maybe_config_file.as_ref().and_then(|cf| {
+ cf.to_maybe_jsx_import_source_module()
+ .map(|im| JsxResolver::new(im, maybe_import_map_resolver.clone()))
+ });
  let maybe_resolver = if maybe_jsx_resolver.is_some() {
  maybe_jsx_resolver.as_ref().map(|jr| jr.as_resolver())
  } else {
@@ -76,8 +73,7 @@ impl CacheServer {
  .map(|im| im.as_resolver())
  };
  let maybe_imports = maybe_config_file
- .map(|cf| cf.to_maybe_imports().ok())
- .flatten()
+ .and_then(|cf| cf.to_maybe_imports().ok())
  .flatten();
  let mut cache = FetchCacher::new(
  ps.dir.gen_cache.clone(),
@@ -187,10 +183,9 @@ impl CacheMetadata {
  let version = self
  .cache
  .get_cache_filename(specifier)
- .map(|ref path| calculate_fs_version(path))
- .flatten();
+ .and_then(|ref path| calculate_fs_version(path));
  let metadata = self.metadata.lock().get(specifier).cloned();
- if metadata.as_ref().map(|m| m.version.clone()).flatten() != version {
+ if metadata.as_ref().and_then(|m| m.version.clone()) != version {
  self.refresh(specifier).map(|m| m.values)
  } else {
  metadata.map(|m| m.values)

cli/lsp/diagnostics.rs

@@ -538,8 +538,7 @@ async fn generate_ts_diagnostics(
  let version = snapshot
  .documents
  .get(&specifier)
- .map(|d| d.maybe_lsp_version())
- .flatten();
+ .and_then(|d| d.maybe_lsp_version());
  // check if the specifier is enabled again just in case TS returns us
  // diagnostics for a disabled specifier
  let ts_diagnostics = if config.specifier_enabled(&specifier) {
@@ -555,8 +554,7 @@ async fn generate_ts_diagnostics(
  let version = snapshot
  .documents
  .get(&specifier)
- .map(|d| d.maybe_lsp_version())
- .flatten();
+ .and_then(|d| d.maybe_lsp_version());
  diagnostics_vec.push((specifier, version, Vec::new()));
  }
  Ok(diagnostics_vec)

cli/lsp/documents.rs

@@ -199,18 +199,17 @@ impl AssetOrDocument {
  ) -> Option<(String, deno_graph::Dependency, deno_graph::Range)> {
  self
  .document()
- .map(|d| d.get_maybe_dependency(position))
- .flatten()
+ .and_then(|d| d.get_maybe_dependency(position))
  }
 
  pub fn maybe_parsed_source(
  &self,
  ) -> Option<Result<deno_ast::ParsedSource, deno_graph::ModuleGraphError>> {
- self.document().map(|d| d.maybe_parsed_source()).flatten()
+ self.document().and_then(|d| d.maybe_parsed_source())
  }
 
  pub fn document_lsp_version(&self) -> Option<i32> {
- self.document().map(|d| d.maybe_lsp_version()).flatten()
+ self.document().and_then(|d| d.maybe_lsp_version())
  }
 }
 
@@ -347,8 +346,7 @@ impl Document {
  .0
  .maybe_language_id
  .as_ref()
- .map(|li| li.as_headers())
- .flatten();
+ .and_then(|li| li.as_headers());
  let parser = SourceParser::default();
  Some(deno_graph::parse_module(
  &self.0.specifier,
@@ -865,8 +863,7 @@ impl Documents {
  } else {
  let mut file_system_docs = self.file_system_docs.lock();
  let fs_version = get_document_path(&self.cache, &specifier)
- .map(|path| calculate_fs_version(&path))
- .flatten();
+ .and_then(|path| calculate_fs_version(&path));
  let file_system_doc = file_system_docs.docs.get(&specifier);
  if file_system_doc.map(|d| d.fs_version().to_string()) != fs_version {
  // attempt to update the file on the file system
@@ -1009,12 +1006,10 @@ impl Documents {
  ) {
  // TODO(@kitsonk) update resolved dependencies?
  self.maybe_import_map = maybe_import_map.map(ImportMapResolver::new);
- self.maybe_jsx_resolver = maybe_config_file
- .map(|cf| {
- cf.to_maybe_jsx_import_source_module()
- .map(|im| JsxResolver::new(im, self.maybe_import_map.clone()))
- })
- .flatten();
+ self.maybe_jsx_resolver = maybe_config_file.and_then(|cf| {
+ cf.to_maybe_jsx_import_source_module()
+ .map(|im| JsxResolver::new(im, self.maybe_import_map.clone()))
+ });
  self.imports = Arc::new(
  if let Some(Ok(Some(imports))) =
  maybe_config_file.map(|cf| cf.to_maybe_imports())
@@ -1094,14 +1089,12 @@ impl Documents {
  specifier: &ModuleSpecifier,
  ) -> Option<(ModuleSpecifier, MediaType)> {
  let doc = self.get(specifier)?;
- let maybe_module = doc.maybe_module().map(|r| r.as_ref().ok()).flatten();
- let maybe_types_dependency = maybe_module
- .map(|m| {
- m.maybe_types_dependency
- .as_ref()
- .map(|(_, resolved)| resolved.clone())
- })
- .flatten();
+ let maybe_module = doc.maybe_module().and_then(|r| r.as_ref().ok());
+ let maybe_types_dependency = maybe_module.and_then(|m| {
+ m.maybe_types_dependency
+ .as_ref()
+ .map(|(_, resolved)| resolved.clone())
+ });
  if let Some(Resolved::Ok { specifier, .. }) = maybe_types_dependency {
  self.resolve_dependency(&specifier)
  } else {

cli/lsp/language_server.rs

@@ -870,8 +870,7 @@ impl Inner {
  params
  .settings
  .as_object()
- .map(|settings| settings.get(SETTINGS_SECTION))
- .flatten()
+ .and_then(|settings| settings.get(SETTINGS_SECTION))
  .cloned()
  };
 
@@ -1075,8 +1074,7 @@ impl Inner {
  {
  let dep_maybe_types_dependency = dep
  .get_code()
- .map(|s| self.documents.get(s))
- .flatten()
+ .and_then(|s| self.documents.get(s))
  .map(|d| d.maybe_types_dependency());
  let value = match (dep.maybe_code.is_none(), dep.maybe_type.is_none(), &dep_maybe_types_dependency) {
  (false, false, None) => format!(
@@ -1242,7 +1240,7 @@ impl Inner {
  &specifier,
  diagnostic,
  asset_or_doc.document().map(|d| d.text_info()),
- asset_or_doc.maybe_parsed_source().map(|r| r.ok()).flatten(),
+ asset_or_doc.maybe_parsed_source().and_then(|r| r.ok()),
  )
  .map_err(|err| {
  error!("Unable to fix lint error: {}", err);
@@ -1426,8 +1424,7 @@ impl Inner {
  error!("Error getting code lenses for \"{}\": {}", specifier, err);
  LspError::internal_error()
  })?;
- let parsed_source =
- asset_or_doc.maybe_parsed_source().map(|r| r.ok()).flatten();
+ let parsed_source = asset_or_doc.maybe_parsed_source().and_then(|r| r.ok());
  let line_index = asset_or_doc.line_index();
  let code_lenses = code_lens::collect(
  &specifier,
@@ -1501,8 +1498,7 @@ impl Inner {
  if let Some(document_highlights) = maybe_document_highlights {
  let result = document_highlights
  .into_iter()
- .map(|dh| dh.to_highlight(line_index.clone()))
- .flatten()
+ .flat_map(|dh| dh.to_highlight(line_index.clone()))
  .collect();
  self.performance.measure(mark);
  Ok(Some(result))

cli/lsp/tsc.rs

@@ -1402,9 +1402,7 @@ impl FileTextChanges {
  ops.push(lsp::DocumentChangeOperation::Edit(lsp::TextDocumentEdit {
  text_document: lsp::OptionalVersionedTextDocumentIdentifier {
  uri: specifier.clone(),
- version: maybe_asset_or_document
- .map(|d| d.document_lsp_version())
- .flatten(),
+ version: maybe_asset_or_document.and_then(|d| d.document_lsp_version()),
  },
  edits,
  }));
@@ -2064,7 +2062,7 @@ impl CompletionEntry {
  return Some(insert_text.clone());
  }
  } else {
- return Some(self.name.replace("#", ""));
+ return Some(self.name.replace('#', ""));
  }
  }