Run cargo clippy --fix

client/src/bin/cli.rs

@@ -82,10 +82,7 @@ fn main() -> anyhow::Result<()> {
     };
 
     let client = reqwest::blocking::Client::new();
-    let template = match &opts.template {
-        Some(template) => Some(collect(&language, template)),
-        None => None,
-    };
+    let template = opts.template.as_ref().map(|template| collect(&language, template));
     let body = client
         .post(format!("{}/api/submit", ENV.public_url))
         .json(&SubmitRequest {

core/src/bin/compute_matches.rs

@@ -26,7 +26,7 @@ fn read_file_lines(s: &Path) -> anyhow::Result<Vec<String>> {
     let mut file = File::open(s)?;
     let mut s = String::new();
     file.read_to_string(&mut s)?;
-    Ok(s.lines().map(|l| String::from(l)).collect::<Vec<String>>())
+    Ok(s.lines().map(String::from).collect::<Vec<String>>())
 }
 
 fn main() -> anyhow::Result<()> {
@@ -56,7 +56,7 @@ fn main() -> anyhow::Result<()> {
             .iter()
             .map(|l| l.as_str())
             .collect::<Vec<&str>>(),
-        template_kind.as_ref().map(|v| v.as_slice()),
+        template_kind.as_deref(),
     );
 
     for is_left in [true, false] {

core/src/lang/mod.rs

@@ -81,7 +81,7 @@ pub fn tokenize(path: &Path) -> anyhow::Result<Vec<Token>> {
             return lang.tokenizer.tokenize(path);
         }
     }
-    return Err(anyhow!("Unsupported file extension: {:?}", path));
+    Err(anyhow!("Unsupported file extension: {:?}", path))
 }
 
 pub fn tokenize_str(content: &str, language: Language) -> anyhow::Result<Vec<Token>> {
@@ -90,5 +90,5 @@ pub fn tokenize_str(content: &str, language: Language) -> anyhow::Result<Vec<Tok
             return lang.tokenizer.tokenize_str(content);
         }
     }
-    return Err(anyhow!("Unsupported language: {:?}", language));
+    Err(anyhow!("Unsupported language: {:?}", language))
 }

core/src/matching.rs

@@ -156,7 +156,7 @@ pub fn compute_matching_blocks_from_text(
         &token_right,
         &token_kind_right,
         &lines_right,
-        template_kind.as_ref().map(|v| v.as_slice()),
+        template_kind.as_deref(),
     );
 
     let mut res = vec![];