summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorYusuke Tanaka <yusuktan@maguro.dev>2021-07-30 22:03:41 +0900
committerGitHub <noreply@github.com>2021-07-30 15:03:41 +0200
commit8f00b5542caffd14988b923efe4f066b712d2858 (patch)
treee56ebefb0b73a2205bc482a0a6f55e87bd35a92b /cli
parentc909faf9e6cd2964398da7c0852d0229cdd1a22b (diff)
chore: upgrade Rust to 1.54.0 (#11554)
Diffstat (limited to 'cli')
-rw-r--r--cli/bench/main.rs4
-rw-r--r--cli/diagnostics.rs2
-rw-r--r--cli/disk_cache.rs2
-rw-r--r--cli/file_fetcher.rs2
-rw-r--r--cli/fmt_errors.rs4
-rw-r--r--cli/http_cache.rs2
-rw-r--r--cli/import_map.rs6
-rw-r--r--cli/lsp/analysis.rs6
-rw-r--r--cli/lsp/code_lens.rs20
-rw-r--r--cli/lsp/diagnostics.rs12
-rw-r--r--cli/lsp/documents.rs6
-rw-r--r--cli/lsp/language_server.rs2
-rw-r--r--cli/lsp/registries.rs15
-rw-r--r--cli/lsp/sources.rs8
-rw-r--r--cli/lsp/tsc.rs2
-rw-r--r--cli/main.rs4
-rw-r--r--cli/module_graph.rs20
-rw-r--r--cli/program_state.rs11
-rw-r--r--cli/specifier_handler.rs4
-rw-r--r--cli/standalone.rs2
-rw-r--r--cli/tools/coverage.rs2
-rw-r--r--cli/tools/fmt.rs14
-rw-r--r--cli/tools/lint.rs2
-rw-r--r--cli/tools/repl.rs4
-rw-r--r--cli/tools/test_runner.rs12
-rw-r--r--cli/tsc.rs6
26 files changed, 87 insertions, 87 deletions
diff --git a/cli/bench/main.rs b/cli/bench/main.rs
index c7a6a714e..e6d735397 100644
--- a/cli/bench/main.rs
+++ b/cli/bench/main.rs
@@ -234,11 +234,11 @@ fn get_binary_sizes(target_dir: &Path) -> Result<HashMap<String, u64>> {
);
// add up size for everything in target/release/deps/libswc*
- let swc_size = rlib_size(&target_dir, "libswc");
+ let swc_size = rlib_size(target_dir, "libswc");
println!("swc {} bytes", swc_size);
sizes.insert("swc_rlib".to_string(), swc_size);
- let rusty_v8_size = rlib_size(&target_dir, "librusty_v8");
+ let rusty_v8_size = rlib_size(target_dir, "librusty_v8");
println!("rusty_v8 {} bytes", rusty_v8_size);
sizes.insert("rusty_v8_rlib".to_string(), rusty_v8_size);
diff --git a/cli/diagnostics.rs b/cli/diagnostics.rs
index 9d1faa6b1..f2c78d5c4 100644
--- a/cli/diagnostics.rs
+++ b/cli/diagnostics.rs
@@ -189,7 +189,7 @@ impl DiagnosticMessageChain {
pub fn format_message(&self, level: usize) -> String {
let mut s = String::new();
- s.push_str(&std::iter::repeat(" ").take(level * 2).collect::<String>());
+ s.push_str(&" ".repeat(level * 2));
s.push_str(&self.message_text);
if let Some(next) = &self.next {
s.push('\n');
diff --git a/cli/disk_cache.rs b/cli/disk_cache.rs
index d24acc3ab..6a5fd6ec8 100644
--- a/cli/disk_cache.rs
+++ b/cli/disk_cache.rs
@@ -139,7 +139,7 @@ impl DiskCache {
pub fn set(&self, filename: &Path, data: &[u8]) -> std::io::Result<()> {
let path = self.location.join(filename);
match path.parent() {
- Some(ref parent) => self.ensure_dir_exists(parent),
+ Some(parent) => self.ensure_dir_exists(parent),
None => Ok(()),
}?;
fs_util::atomic_write_file(&path, data, crate::http_cache::CACHE_PERM)
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index 61cf1dae6..a7bd503ae 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -469,7 +469,7 @@ impl FileFetcher {
Ok((_, headers)) => headers.get("etag").cloned(),
_ => None,
};
- let maybe_auth_token = self.auth_tokens.get(&specifier);
+ let maybe_auth_token = self.auth_tokens.get(specifier);
let specifier = specifier.clone();
let mut permissions = permissions.clone();
let client = self.http_client.clone();
diff --git a/cli/fmt_errors.rs b/cli/fmt_errors.rs
index 9431dab07..2078c8b32 100644
--- a/cli/fmt_errors.rs
+++ b/cli/fmt_errors.rs
@@ -67,7 +67,7 @@ fn format_frame(frame: &JsStackFrame) -> String {
formatted_method += &format!("{}.", type_name);
}
}
- formatted_method += &function_name;
+ formatted_method += function_name;
if let Some(method_name) = &frame.method_name {
if !function_name.ends_with(method_name) {
formatted_method += &format!(" [as {}]", method_name);
@@ -78,7 +78,7 @@ fn format_frame(frame: &JsStackFrame) -> String {
formatted_method += &format!("{}.", type_name);
}
if let Some(method_name) = &frame.method_name {
- formatted_method += &method_name
+ formatted_method += method_name
} else {
formatted_method += "<anonymous>";
}
diff --git a/cli/http_cache.rs b/cli/http_cache.rs
index 37da00983..115eb10a4 100644
--- a/cli/http_cache.rs
+++ b/cli/http_cache.rs
@@ -93,7 +93,7 @@ impl Metadata {
#[cfg(test)]
pub fn read(cache_filename: &Path) -> Result<Metadata, AnyError> {
- let metadata_filename = Metadata::filename(&cache_filename);
+ let metadata_filename = Metadata::filename(cache_filename);
let metadata = fs::read_to_string(metadata_filename)?;
let metadata: Metadata = serde_json::from_str(&metadata)?;
Ok(metadata)
diff --git a/cli/import_map.rs b/cli/import_map.rs
index 0c7a6f76c..17ac3727e 100644
--- a/cli/import_map.rs
+++ b/cli/import_map.rs
@@ -268,7 +268,7 @@ impl ImportMap {
}
// Sort in longest and alphabetical order.
- normalized_map.sort_by(|k1, _v1, k2, _v2| match k1.cmp(&k2) {
+ normalized_map.sort_by(|k1, _v1, k2, _v2| match k1.cmp(k2) {
Ordering::Greater => Ordering::Less,
Ordering::Less => Ordering::Greater,
// JSON guarantees that there can't be duplicate keys
@@ -324,7 +324,7 @@ impl ImportMap {
}
// Sort in longest and alphabetical order.
- normalized_map.sort_by(|k1, _v1, k2, _v2| match k1.cmp(&k2) {
+ normalized_map.sort_by(|k1, _v1, k2, _v2| match k1.cmp(k2) {
Ordering::Greater => Ordering::Less,
Ordering::Less => Ordering::Greater,
// JSON guarantees that there can't be duplicate keys
@@ -691,7 +691,7 @@ mod tests {
ImportMap::from_json(&test.import_map_base_url, &test.import_map)
.unwrap();
let maybe_resolved = import_map
- .resolve(&given_specifier, &base_url)
+ .resolve(given_specifier, base_url)
.ok()
.map(|url| url.to_string());
assert_eq!(expected_specifier, &maybe_resolved, "{}", test.name);
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(),
})
}
diff --git a/cli/main.rs b/cli/main.rs
index 52f2c55af..77366ec12 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -1088,7 +1088,7 @@ async fn test_command(
output.insert(specifier);
get_dependencies(
- &graph,
+ graph,
graph.get_specifier(specifier)?,
output,
)?;
@@ -1099,7 +1099,7 @@ async fn test_command(
output.insert(specifier);
get_dependencies(
- &graph,
+ graph,
graph.get_specifier(specifier)?,
output,
)?;
diff --git a/cli/module_graph.rs b/cli/module_graph.rs
index ee359b4bc..1a82bce0e 100644
--- a/cli/module_graph.rs
+++ b/cli/module_graph.rs
@@ -348,7 +348,7 @@ impl Module {
// parse out any triple slash references
for comment in parsed_module.get_leading_comments().iter() {
- if let Some((ts_reference, _)) = parse_ts_reference(&comment) {
+ if let Some((ts_reference, _)) = parse_ts_reference(comment) {
let location = parsed_module.get_location(&comment.span);
match ts_reference {
TypeScriptReference::Path(import) => {
@@ -421,7 +421,7 @@ impl Module {
// Parse out any `@deno-types` pragmas and modify dependency
let maybe_type = if !desc.leading_comments.is_empty() {
let comment = desc.leading_comments.last().unwrap();
- if let Some((deno_types, _)) = parse_deno_types(&comment).as_ref() {
+ if let Some((deno_types, _)) = parse_deno_types(comment).as_ref() {
Some(self.resolve_import(deno_types, Some(location.clone()))?)
} else {
None
@@ -923,7 +923,7 @@ impl Graph {
// to ESM, which we don't really want unless someone has enabled the
// check_js option.
if !check_js
- && graph.get_media_type(&specifier) == Some(MediaType::JavaScript)
+ && graph.get_media_type(specifier) == Some(MediaType::JavaScript)
{
debug!("skipping emit for {}", specifier);
continue;
@@ -1931,7 +1931,7 @@ impl GraphBuilder {
maybe_referrer: &Option<Location>,
is_dynamic: bool,
) {
- if !self.graph.modules.contains_key(&specifier) {
+ if !self.graph.modules.contains_key(specifier) {
self
.graph
.modules
@@ -2231,21 +2231,21 @@ pub mod tests {
#[test]
fn test_get_version() {
let doc_a = "console.log(42);";
- let version_a = get_version(&doc_a, "1.2.3", b"");
+ let version_a = get_version(doc_a, "1.2.3", b"");
let doc_b = "console.log(42);";
- let version_b = get_version(&doc_b, "1.2.3", b"");
+ let version_b = get_version(doc_b, "1.2.3", b"");
assert_eq!(version_a, version_b);
- let version_c = get_version(&doc_a, "1.2.3", b"options");
+ let version_c = get_version(doc_a, "1.2.3", b"options");
assert_ne!(version_a, version_c);
- let version_d = get_version(&doc_b, "1.2.3", b"options");
+ let version_d = get_version(doc_b, "1.2.3", b"options");
assert_eq!(version_c, version_d);
- let version_e = get_version(&doc_a, "1.2.4", b"");
+ let version_e = get_version(doc_a, "1.2.4", b"");
assert_ne!(version_a, version_e);
- let version_f = get_version(&doc_b, "1.2.4", b"");
+ let version_f = get_version(doc_b, "1.2.4", b"");
assert_eq!(version_e, version_f);
}
diff --git a/cli/program_state.rs b/cli/program_state.rs
index 6775b2276..b8fb5e33b 100644
--- a/cli/program_state.rs
+++ b/cli/program_state.rs
@@ -115,9 +115,10 @@ impl ProgramState {
None => None,
Some(import_map_url) => {
let import_map_specifier =
- deno_core::resolve_url_or_path(&import_map_url).context(
- format!("Bad URL (\"{}\") for import map.", import_map_url),
- )?;
+ deno_core::resolve_url_or_path(import_map_url).context(format!(
+ "Bad URL (\"{}\") for import map.",
+ import_map_url
+ ))?;
let file = file_fetcher
.fetch(&import_map_specifier, &mut Permissions::allow_all())
.await
@@ -369,11 +370,11 @@ impl ProgramState {
let emit_path = self
.dir
.gen_cache
- .get_cache_filename_with_extension(&url, "js")?;
+ .get_cache_filename_with_extension(url, "js")?;
let emit_map_path = self
.dir
.gen_cache
- .get_cache_filename_with_extension(&url, "js.map")?;
+ .get_cache_filename_with_extension(url, "js.map")?;
if let Ok(code) = self.dir.gen_cache.get(&emit_path) {
let maybe_map = if let Ok(map) = self.dir.gen_cache.get(&emit_map_path) {
Some(map)
diff --git a/cli/specifier_handler.rs b/cli/specifier_handler.rs
index cec1049a3..ae47e977a 100644
--- a/cli/specifier_handler.rs
+++ b/cli/specifier_handler.rs
@@ -327,7 +327,7 @@ impl SpecifierHandler for FetchHandler {
let mut maybe_map_path = None;
let map_path =
- disk_cache.get_cache_filename_with_extension(&url, "js.map");
+ disk_cache.get_cache_filename_with_extension(url, "js.map");
let maybe_map = if let Some(map_path) = map_path {
if let Ok(map) = disk_cache.get(&map_path) {
maybe_map_path = Some(disk_cache.location.join(map_path));
@@ -340,7 +340,7 @@ impl SpecifierHandler for FetchHandler {
};
let mut maybe_emit = None;
let mut maybe_emit_path = None;
- let emit_path = disk_cache.get_cache_filename_with_extension(&url, "js");
+ let emit_path = disk_cache.get_cache_filename_with_extension(url, "js");
if let Some(emit_path) = emit_path {
if let Ok(code) = disk_cache.get(&emit_path) {
maybe_emit =
diff --git a/cli/standalone.rs b/cli/standalone.rs
index 65ca58ec3..9a693d961 100644
--- a/cli/standalone.rs
+++ b/cli/standalone.rs
@@ -142,7 +142,7 @@ impl ModuleLoader for EmbeddedModuleLoader {
_referrer: &str,
_is_main: bool,
) -> Result<ModuleSpecifier, AnyError> {
- if let Ok(module_specifier) = resolve_url(&specifier) {
+ if let Ok(module_specifier) = resolve_url(specifier) {
if get_source_from_data_url(&module_specifier).is_ok()
|| specifier == SPECIFIER
{
diff --git a/cli/tools/coverage.rs b/cli/tools/coverage.rs
index b7772f310..bb1e9417d 100644
--- a/cli/tools/coverage.rs
+++ b/cli/tools/coverage.rs
@@ -709,7 +709,7 @@ pub async fn cover_files(
reporter.visit_coverage(
&script_coverage,
- &script_source,
+ script_source,
maybe_source_map,
maybe_cached_source,
);
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
index ac9af0292..a02b86b17 100644
--- a/cli/tools/fmt.rs
+++ b/cli/tools/fmt.rs
@@ -99,7 +99,7 @@ fn format_markdown(
) -> Result<String, String> {
let md_config = get_markdown_config();
dprint_plugin_markdown::format_text(
- &file_text,
+ file_text,
&md_config,
move |tag, text, line_width| {
let tag = tag.to_lowercase();
@@ -125,7 +125,7 @@ fn format_markdown(
if matches!(extension, "json" | "jsonc") {
let mut json_config = get_json_config();
json_config.line_width = line_width;
- dprint_plugin_json::format_text(&text, &json_config)
+ dprint_plugin_json::format_text(text, &json_config)
} else {
let fake_filename =
PathBuf::from(format!("deno_fmt_stdin.{}", extension));
@@ -133,7 +133,7 @@ fn format_markdown(
codeblock_config.line_width = line_width;
dprint_plugin_typescript::format_text(
&fake_filename,
- &text,
+ text,
&codeblock_config,
)
}
@@ -150,7 +150,7 @@ fn format_markdown(
/// See https://git.io/Jt4ht for configuration.
fn format_json(file_text: &str) -> Result<String, String> {
let json_config = get_json_config();
- dprint_plugin_json::format_text(&file_text, &json_config)
+ dprint_plugin_json::format_text(file_text, &json_config)
.map_err(|e| e.to_string())
}
@@ -162,11 +162,11 @@ pub fn format_file(
) -> Result<String, String> {
let ext = get_extension(file_path).unwrap_or_else(String::new);
if ext == "md" {
- format_markdown(&file_text, config)
+ format_markdown(file_text, config)
} else if matches!(ext.as_str(), "json" | "jsonc") {
- format_json(&file_text)
+ format_json(file_text)
} else {
- dprint_plugin_typescript::format_text(&file_path, &file_text, &config)
+ dprint_plugin_typescript::format_text(file_path, file_text, &config)
.map_err(|e| e.to_string())
}
}
diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs
index 0b0479a04..967eec2ad 100644
--- a/cli/tools/lint.rs
+++ b/cli/tools/lint.rs
@@ -81,7 +81,7 @@ pub async fn lint_files(
sort_diagnostics(&mut file_diagnostics);
for d in file_diagnostics.iter() {
has_error.store(true, Ordering::Relaxed);
- reporter.visit_diagnostic(&d, source.split('\n').collect());
+ reporter.visit_diagnostic(d, source.split('\n').collect());
}
}
Err(err) => {
diff --git a/cli/tools/repl.rs b/cli/tools/repl.rs
index b86e8ccd8..5b0d78841 100644
--- a/cli/tools/repl.rs
+++ b/cli/tools/repl.rs
@@ -555,7 +555,7 @@ impl ReplSession {
if evaluate_response.get("exceptionDetails").is_some()
&& wrapped_line != line
{
- self.evaluate_ts_expression(&line).await?
+ self.evaluate_ts_expression(line).await?
} else {
evaluate_response
};
@@ -632,7 +632,7 @@ impl ReplSession {
expression: &str,
) -> Result<Value, AnyError> {
let parsed_module =
- crate::ast::parse("repl.ts", &expression, &crate::MediaType::TypeScript)?;
+ crate::ast::parse("repl.ts", expression, &crate::MediaType::TypeScript)?;
let transpiled_src = parsed_module
.transpile(&crate::ast::EmitOptions {
diff --git a/cli/tools/test_runner.rs b/cli/tools/test_runner.rs
index a9610015e..656db50f4 100644
--- a/cli/tools/test_runner.rs
+++ b/cli/tools/test_runner.rs
@@ -355,7 +355,7 @@ fn extract_files_from_regex_blocks(
lines_regex: &Regex,
) -> Result<Vec<File>, AnyError> {
let files = blocks_regex
- .captures_iter(&source)
+ .captures_iter(source)
.filter_map(|block| {
let maybe_attributes = block
.get(1)
@@ -390,7 +390,7 @@ fn extract_files_from_regex_blocks(
// TODO(caspervonb) generate an inline source map
let mut file_source = String::new();
- for line in lines_regex.captures_iter(&text) {
+ for line in lines_regex.captures_iter(text) {
let text = line.get(1).unwrap();
file_source.push_str(&format!("{}\n", text.as_str()));
}
@@ -424,7 +424,7 @@ fn extract_files_from_source_comments(
source: &str,
media_type: &MediaType,
) -> Result<Vec<File>, AnyError> {
- let parsed_module = ast::parse(&specifier.as_str(), &source, &media_type)?;
+ let parsed_module = ast::parse(specifier.as_str(), source, media_type)?;
let mut comments = parsed_module.get_comments();
comments
.sort_by_key(|comment| parsed_module.get_location(&comment.span).line);
@@ -447,7 +447,7 @@ fn extract_files_from_source_comments(
extract_files_from_regex_blocks(
&location,
&comment.text,
- &media_type,
+ media_type,
&blocks_regex,
&lines_regex,
)
@@ -474,8 +474,8 @@ fn extract_files_from_fenced_blocks(
extract_files_from_regex_blocks(
&location,
- &source,
- &media_type,
+ source,
+ media_type,
&blocks_regex,
&lines_regex,
)
diff --git a/cli/tsc.rs b/cli/tsc.rs
index 1b923aa3b..b355c12fa 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -510,9 +510,9 @@ pub fn exec(request: Request) -> Result<Response, AnyError> {
.map(|(s, mt)| match s.scheme() {
"data" | "blob" => {
let specifier_str = if s.scheme() == "data" {
- hash_data_url(&s, &mt)
+ hash_data_url(s, mt)
} else {
- hash_blob_url(&s, &mt)
+ hash_blob_url(s, mt)
};
data_url_map.insert(specifier_str.clone(), s.clone());
specifier_str
@@ -640,7 +640,7 @@ mod tests {
..Default::default()
}));
let mut builder = GraphBuilder::new(handler.clone(), None, None);
- builder.add(&specifier, false).await?;
+ builder.add(specifier, false).await?;
let graph = Arc::new(Mutex::new(builder.get_graph()));
let config = TsConfig::new(json!({
"allowJs": true,