From dc5ec1cf5380910fa6eb71af7c452ddc62582f82 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Fri, 1 Sep 2023 17:01:39 -0400 Subject: [PATCH] refactor: remove `&Option` where used --- cli/loader/src/lib.rs | 34 +++++++++++++++---------------- cli/src/playground.rs | 14 ++++++------- cli/src/tests/helpers/fixtures.rs | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cli/loader/src/lib.rs b/cli/loader/src/lib.rs index 3022b6b9..1fbb1473 100644 --- a/cli/loader/src/lib.rs +++ b/cli/loader/src/lib.rs @@ -344,7 +344,7 @@ impl Loader { &grammar_json.name, &header_path, &parser_path, - &scanner_path, + scanner_path.as_deref(), ) } @@ -353,7 +353,7 @@ impl Loader { name: &str, header_path: &Path, parser_path: &Path, - scanner_path: &Option, + scanner_path: Option<&Path>, ) -> Result { let mut lib_name = name.to_string(); if self.debug_build { @@ -362,7 +362,7 @@ impl Loader { let mut library_path = self.parser_lib_path.join(lib_name); library_path.set_extension(DYLIB_EXTENSION); - let recompile = needs_recompile(&library_path, &parser_path, &scanner_path) + let recompile = needs_recompile(&library_path, &parser_path, scanner_path) .with_context(|| "Failed to compare source and binary timestamps")?; if recompile { @@ -740,21 +740,21 @@ impl<'a> LanguageConfiguration<'a> { .iter() .filter(|p| p.ends_with("highlights.scm")) .cloned() - .collect(), + .collect::>(), ), Some( paths .iter() .filter(|p| p.ends_with("tags.scm")) .cloned() - .collect(), + .collect::>(), ), Some( paths .iter() .filter(|p| p.ends_with("locals.scm")) .cloned() - .collect(), + .collect::>(), ), ), None => (None, None, None), @@ -764,25 +764,25 @@ impl<'a> LanguageConfiguration<'a> { .get_or_try_init(|| { let (highlights_query, highlight_ranges) = self.read_queries( if highlights_filenames.is_some() { - &highlights_filenames + highlights_filenames.as_deref() } else { - &self.highlights_filenames + self.highlights_filenames.as_deref() }, "highlights.scm", )?; let (injections_query, injection_ranges) = self.read_queries( if injections_filenames.is_some() { - &injections_filenames + injections_filenames.as_deref() } else { - &self.injections_filenames + self.injections_filenames.as_deref() }, "injections.scm", )?; let (locals_query, locals_ranges) = self.read_queries( if locals_filenames.is_some() { - &locals_filenames + locals_filenames.as_deref() } else { - &self.locals_filenames + self.locals_filenames.as_deref() }, "locals.scm", )?; @@ -844,9 +844,9 @@ impl<'a> LanguageConfiguration<'a> { self.tags_config .get_or_try_init(|| { let (tags_query, tags_ranges) = - self.read_queries(&self.tags_filenames, "tags.scm")?; + self.read_queries(self.tags_filenames.as_deref(), "tags.scm")?; let (locals_query, locals_ranges) = - self.read_queries(&self.locals_filenames, "locals.scm")?; + self.read_queries(self.locals_filenames.as_deref(), "locals.scm")?; if tags_query.is_empty() { Ok(None) } else { @@ -900,12 +900,12 @@ impl<'a> LanguageConfiguration<'a> { fn read_queries( &self, - paths: &Option>, + paths: Option<&[String]>, default_path: &str, ) -> Result<(String, Vec<(String, Range)>)> { let mut query = String::new(); let mut path_ranges = Vec::new(); - if let Some(paths) = paths.as_ref() { + if let Some(paths) = paths { for path in paths { let abs_path = self.root_path.join(path); let prev_query_len = query.len(); @@ -930,7 +930,7 @@ impl<'a> LanguageConfiguration<'a> { fn needs_recompile( lib_path: &Path, parser_c_path: &Path, - scanner_path: &Option, + scanner_path: Option<&Path>, ) -> Result { if !lib_path.exists() { return Ok(true); diff --git a/cli/src/playground.rs b/cli/src/playground.rs index 662eb8aa..35314c77 100644 --- a/cli/src/playground.rs +++ b/cli/src/playground.rs @@ -12,7 +12,7 @@ use tiny_http::{Header, Response, Server}; macro_rules! optional_resource { ($name: tt, $path: tt) => { #[cfg(TREE_SITTER_EMBED_WASM_BINDING)] - fn $name(tree_sitter_dir: &Option) -> Cow<'static, [u8]> { + fn $name(tree_sitter_dir: Option<&PathBuf>) -> Cow<'static, [u8]> { if let Some(tree_sitter_dir) = tree_sitter_dir { Cow::Owned(fs::read(tree_sitter_dir.join($path)).unwrap()) } else { @@ -21,7 +21,7 @@ macro_rules! optional_resource { } #[cfg(not(TREE_SITTER_EMBED_WASM_BINDING))] - fn $name(tree_sitter_dir: &Option) -> Cow<'static, [u8]> { + fn $name(tree_sitter_dir: Option<&PathBuf>) -> Cow<'static, [u8]> { if let Some(tree_sitter_dir) = tree_sitter_dir { Cow::Owned(fs::read(tree_sitter_dir.join($path)).unwrap()) } else { @@ -35,7 +35,7 @@ optional_resource!(get_playground_js, "docs/assets/js/playground.js"); optional_resource!(get_lib_js, "lib/binding_web/tree-sitter.js"); optional_resource!(get_lib_wasm, "lib/binding_web/tree-sitter.wasm"); -fn get_main_html(tree_sitter_dir: &Option) -> Cow<'static, [u8]> { +fn get_main_html(tree_sitter_dir: Option<&PathBuf>) -> Cow<'static, [u8]> { if let Some(tree_sitter_dir) = tree_sitter_dir { Cow::Owned(fs::read(tree_sitter_dir.join("cli/src/playground.html")).unwrap()) } else { @@ -63,13 +63,13 @@ pub fn serve(grammar_path: &Path, open_in_browser: bool) -> Result<()> { } let tree_sitter_dir = env::var("TREE_SITTER_BASE_DIR").map(PathBuf::from).ok(); - let main_html = str::from_utf8(&get_main_html(&tree_sitter_dir)) + let main_html = str::from_utf8(&get_main_html(tree_sitter_dir.as_ref())) .unwrap() .replace("THE_LANGUAGE_NAME", &grammar_name) .into_bytes(); - let playground_js = get_playground_js(&tree_sitter_dir); - let lib_js = get_lib_js(&tree_sitter_dir); - let lib_wasm = get_lib_wasm(&tree_sitter_dir); + let playground_js = get_playground_js(tree_sitter_dir.as_ref()); + let lib_js = get_lib_js(tree_sitter_dir.as_ref()); + let lib_wasm = get_lib_wasm(tree_sitter_dir.as_ref()); let html_header = Header::from_str("Content-Type: text/html").unwrap(); let js_header = Header::from_str("Content-Type: application/javascript").unwrap(); diff --git a/cli/src/tests/helpers/fixtures.rs b/cli/src/tests/helpers/fixtures.rs index 5d27329b..0f45ef54 100644 --- a/cli/src/tests/helpers/fixtures.rs +++ b/cli/src/tests/helpers/fixtures.rs @@ -88,7 +88,7 @@ pub fn get_test_language(name: &str, parser_code: &str, path: Option<&Path>) -> } }); TEST_LOADER - .load_language_from_sources(name, &HEADER_DIR, &parser_c_path, &scanner_path) + .load_language_from_sources(name, &HEADER_DIR, &parser_c_path, scanner_path.as_deref()) .unwrap() }