PR #128: Enable clippy in CI

Also fix some issues it reports.

.github/workflows/rust.yml

@@ -51,6 +51,20 @@ jobs:
         with:
           command: check
 
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+        components: clippy
+    - uses: actions-rs/cargo@v1
+      with:
+        command: clippy
+        args: --all-features
+
   test:
     name: Test Suite
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -9,7 +9,7 @@ project adheres to
 
 ## Unreleased
 
-* Minor code cleanups.
+* Enable clippy in CI and fix some things it complained about (PR #128).
 * Update sass-spec test suite to 2022-02-24.
 
 

src/spectest/main.rs

@@ -77,7 +77,7 @@ fn handle_suite(
         let mut tr = File::create(rssuitedir.join("testrunner.rs"))?;
         tr.write_all(include_bytes!("testrunner.rs"))?;
     }
-    handle_entries(&mut rs, &base, &suitedir, &rssuitedir, None, ignored)
+    handle_entries(&mut rs, base, &suitedir, &rssuitedir, None, ignored)
         .map_err(|e| {
             Error(format!("Failed to handle suite {:?}: {}", suite, e))
         })
@@ -134,7 +134,7 @@ fn handle_entries(
                 if input.exists() {
                     spec_dir_to_test(
                         rs,
-                        &suitedir,
+                        suitedir,
                         &entry.file_name(),
                         precision,
                     )
@@ -184,7 +184,7 @@ fn handle_entries(
                             .collect();
                         handle_entries(
                             &mut rs,
-                            &root,
+                            root,
                             &entry.path(),
                             &rssuitedir,
                             precision,
@@ -304,7 +304,7 @@ fn handle_hrx_part(
     if archive.get(&format!("{}input.scss", prefix)).is_some() {
         let fixture = load_test_fixture_hrx(
             name.map(str::to_owned),
-            &archive,
+            archive,
             prefix,
             options,
         )?;
@@ -337,7 +337,7 @@ fn handle_hrx_part(
                 handle_hrx_part(
                     rs,
                     suite,
-                    &archive,
+                    archive,
                     &format!("{}{}", prefix, name),
                     options.precision,
                     runner.clone().with_cwd(name),
@@ -404,7 +404,7 @@ fn load_test_fixture_dir(
     static EXPECTED_ERROR_FILENAMES: &[&str] = &["error-dart-sass", "error"];
 
     let name = specdir.file_name().map(|s| s.to_string_lossy().to_string());
-    let mut options = load_options(&specdir)?;
+    let mut options = load_options(specdir)?;
     options.precision = options.precision.or(precision);
     let input = content(&specdir.join(INPUT_FILENAME))?;
 

src/spectest/options.rs

@@ -11,7 +11,7 @@ pub struct Options {
 
 impl Options {
     pub fn parse(options: &str) -> Result<Options, Error> {
-        match &YamlLoader::load_from_str(&options)?[..] {
+        match &YamlLoader::load_from_str(options)?[..] {
             [] => Err(Error(format!("Found zero-doc options {:?}", options))),
             [options] => {
                 //eprintln!("Found options: {:?}", options);

src/spectest/testfixture.rs

@@ -152,5 +152,5 @@ fn normalize_output_css(css: &str) -> String {
     lazy_static! {
         static ref RE: Regex = Regex::new("(?:\r?\n)+").unwrap();
     }
-    RE.replace_all(&css, "\n").to_string()
+    RE.replace_all(css, "\n").to_string()
 }

src/spectest/testrunner.rs

@@ -63,7 +63,7 @@ impl FileContext for TestFileContext {
         &self,
         name: &str,
     ) -> Result<Option<(Self, String, Self::File)>, Error> {
-        let mut cwd: &str = &self.cwd.trim_end_matches('/');
+        let mut cwd = self.cwd.trim_end_matches('/');
         let mut lname = name;
         while let Some(name) = lname.strip_prefix("../") {
             cwd = cwd.rfind('/').map(|p| &self.cwd[..p]).unwrap_or("");