Merge pull request #94 from HenningHolmDE/fix_clippy

kraigher · web-flow · commit 8bd14214c4f4 · 2020-08-17T19:36:25.000+02:00
Fix Clippy for current stable Rust (1.45.2)
diff --git a/.github/workflows/build-test-all.yml b/.github/workflows/build-test-all.yml
@@ -3,7 +3,6 @@ name: Build & test all configs
 on: [push, pull_request]
 
 jobs:
-
   release-notice:
     name: This is a release build
     if: startsWith(github.ref, 'refs/tags/v')
@@ -29,7 +28,7 @@ jobs:
         include:
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
-            ext: ''
+            ext: ""
           - target: x86_64-pc-windows-msvc
             os: windows-latest
             ext: .exe
@@ -71,7 +70,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --package ${{ matrix.crate }} -- -D warnings
+          args: --package ${{ matrix.crate }} --all-targets --all-features -- -D warnings
 
       - name: Assemble
         if: matrix.rust == 'stable'
@@ -87,7 +86,7 @@ jobs:
         with:
           name: ${{ matrix.crate }}-${{ matrix.target }}
           path: ${{ matrix.crate }}-${{ matrix.target }}
-  
+
   release:
     name: Release
     if: startsWith(github.ref, 'refs/tags/v')
@@ -160,4 +159,4 @@ jobs:
           draft: false
           artifacts: "vhdl_lang-x86_64-unknown-linux-gnu.zip,vhdl_ls-x86_64-unknown-linux-gnu.zip,vhdl_lang-x86_64-pc-windows-msvc.zip,vhdl_ls-x86_64-pc-windows-msvc.zip"
           bodyFile: "release_notes/v${{ steps.v.outputs.v }}.md"
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/vhdl_lang/src/analysis/lock.rs b/vhdl_lang/src/analysis/lock.rs
@@ -167,13 +167,13 @@ mod tests {
         match lock.entry() {
             AnalysisEntry::Occupied(entry) => {
                 assert_eq!(*entry, 2);
-                assert_eq!(*entry.result(), 1.0);
+                assert!((*entry.result() - 1.0_f64).abs() < std::f64::EPSILON);
             }
             _ => panic!("Expected Occupied entry"),
         };
 
         assert_eq!(*lock.get().unwrap(), 2);
-        assert_eq!(*lock.get().unwrap().result(), 1.0);
+        assert!((*lock.get().unwrap().result() - 1.0_f64).abs() < std::f64::EPSILON);
 
         // Check that lock is reset
         lock.reset();
diff --git a/vhdl_lang/src/analysis/root.rs b/vhdl_lang/src/analysis/root.rs
@@ -637,7 +637,7 @@ mod tests {
     use super::*;
     use crate::syntax::test::{check_diagnostics, Code};
 
-    fn new_library_with_diagnostics<'a>(code: &Code, name: &str) -> (Library, Vec<Diagnostic>) {
+    fn new_library_with_diagnostics(code: &Code, name: &str) -> (Library, Vec<Diagnostic>) {
         let mut diagnostics = Vec::new();
         let mut library = Library::new(code.symbol(name));
         library.add_design_file(code.design_file());
diff --git a/vhdl_lang/src/analysis/tests/incremental_analysis.rs b/vhdl_lang/src/analysis/tests/incremental_analysis.rs
@@ -307,7 +307,7 @@ fn check_analysis_equal(got: &mut DesignRoot, expected: &mut DesignRoot) -> Vec<
     expected.analyze(&mut expected_diagnostics);
 
     // Check that diagnostics are equal to doing analysis from scratch
-    check_diagnostics(got_diagnostics.clone(), expected_diagnostics.clone());
+    check_diagnostics(got_diagnostics.clone(), expected_diagnostics);
 
     // Check that all references are equal, ensures the incremental
     // analysis has cleared refereces
diff --git a/vhdl_lang/src/analysis/tests/resolves_design_units.rs b/vhdl_lang/src/analysis/tests/resolves_design_units.rs
@@ -294,7 +294,7 @@ end architecture;
     // Find all references
     assert_eq_unordered(
         &root.find_all_references(&code.s1("ename1").pos()),
-        &vec![
+        &[
             code.s("ename1", 1).pos(),
             code.s("ename1", 2).pos(),
             code.s("ename1", 3).pos(),
@@ -403,7 +403,7 @@ end package body;
     // Find all references
     assert_eq_unordered(
         &root.find_all_references(&code.s1("pkg").pos()),
-        &vec![code.s("pkg", 1).pos(), code.s("pkg", 2).pos()],
+        &[code.s("pkg", 1).pos(), code.s("pkg", 2).pos()],
     );
 }
 
diff --git a/vhdl_lang/src/analysis/tests/resolves_type_mark.rs b/vhdl_lang/src/analysis/tests/resolves_type_mark.rs
@@ -147,7 +147,7 @@ end package;",
     // Cursor at end of symbol
     assert_eq!(
         root.search_reference(code2.source(), code2.s1("typ_t").end()),
-        Some(decl_pos.clone())
+        Some(decl_pos)
     );
 
     // Cursor after end of symbol
@@ -206,10 +206,10 @@ end package;",
     check_no_diagnostics(&diagnostics);
 
     let references = vec![
-        code1.s("typ_t", 1).pos().clone(),
-        code1.s("typ_t", 2).pos().clone(),
-        code2.s("typ_t", 1).pos().clone(),
-        code2.s("typ_t", 2).pos().clone(),
+        code1.s("typ_t", 1).pos(),
+        code1.s("typ_t", 2).pos(),
+        code2.s("typ_t", 1).pos(),
+        code2.s("typ_t", 2).pos(),
     ];
 
     assert_eq_unordered(
@@ -249,10 +249,7 @@ end package;",
 
     assert_eq_unordered(
         &root.find_all_references(&code.s("typ_t", 1).pos()),
-        &vec![
-            code.s("typ_t", 1).pos().clone(),
-            code.s("typ_t", 2).pos().clone(),
-        ],
+        &[code.s("typ_t", 1).pos(), code.s("typ_t", 2).pos()],
     );
 }
 
diff --git a/vhdl_lang/src/analysis/tests/util.rs b/vhdl_lang/src/analysis/tests/util.rs
@@ -29,10 +29,10 @@ impl LibraryBuilder {
         let library_name = self.code_builder.symbol(library_name);
         match self.libraries.entry(library_name) {
             Entry::Occupied(mut entry) => {
-                entry.get_mut().push(code.clone());
+                entry.get_mut().push(code);
             }
             Entry::Vacant(entry) => {
-                entry.insert(vec![code.clone()]);
+                entry.insert(vec![code]);
             }
         }
     }
@@ -102,7 +102,7 @@ pub fn add_standard_library(symbols: Arc<Symbols>, root: &mut DesignRoot) {
 
     root.add_design_file(std_sym.clone(), std_standard.design_file());
     root.add_design_file(std_sym.clone(), std_textio.design_file());
-    root.add_design_file(std_sym.clone(), std_env.design_file());
+    root.add_design_file(std_sym, std_env.design_file());
 }
 
 pub fn missing(code: &Code, name: &str, occ: usize) -> Diagnostic {
diff --git a/vhdl_lang/src/config.rs b/vhdl_lang/src/config.rs
@@ -311,7 +311,6 @@ fn is_literal(pattern: &str, is_windows: bool) -> bool {
 mod tests {
     use super::*;
     use pretty_assertions::assert_eq;
-    use tempfile;
 
     /// Utility function to create an empty file in parent folder
     fn touch(parent: &Path, file_name: &str) -> PathBuf {
@@ -444,7 +443,7 @@ lib3.files = [
         )
         .unwrap();
 
-        let mut merged_config = config0.clone();
+        let mut merged_config = config0;
         merged_config.append(&config1, &mut Vec::new());
         assert_eq!(merged_config, expected_config);
     }
diff --git a/vhdl_lang/src/data/contents.rs b/vhdl_lang/src/data/contents.rs
@@ -457,7 +457,7 @@ mod tests {
     fn character_is_utf16_len() {
         // Bomb emojii requires 2 utf-16 codes
         let bomb = '\u{1F4A3}';
-        let contents = new(&format!("aä{}", bomb).to_string());
+        let contents = new(&format!("aä{}", bomb));
         assert_eq!(contents.end(), Position::new(0, 4));
         let mut reader = reader(&contents);
         assert_eq!(reader.pop_char(), Some('a'));
diff --git a/vhdl_lang/src/data/source.rs b/vhdl_lang/src/data/source.rs
@@ -81,7 +81,6 @@ impl UniqueSource {
 
     #[cfg(test)]
     pub fn from_contents(file_name: &Path, contents: Contents) -> UniqueSource {
-        let file_name = file_name.into();
         Self {
             file_id: FileId::new(file_name),
             contents: RwLock::new(contents),
@@ -545,7 +544,6 @@ mod tests {
     use crate::data::Latin1String;
     use crate::syntax::test::{Code, CodeBuilder};
     use pretty_assertions::assert_eq;
-    use tempfile;
 
     #[test]
     fn srcpos_combine() {
@@ -568,7 +566,7 @@ mod tests {
         use std::io::Write;
         let mut file = tempfile::NamedTempFile::new().unwrap();
         let file_name = file.path().to_owned();
-        file.write(&Latin1String::from_utf8_unchecked(contents).bytes)
+        file.write_all(&Latin1String::from_utf8_unchecked(contents).bytes)
             .unwrap();
         fun(CodeBuilder::new().code_from_source(Source::from_latin1_file(&file_name).unwrap()))
     }
diff --git a/vhdl_lang/src/syntax/attributes.rs b/vhdl_lang/src/syntax/attributes.rs
@@ -112,8 +112,8 @@ pub fn parse_attribute(stream: &mut TokenStream) -> ParseResult<Vec<Attribute>>
                 .map(|entity_name| {
                     Attribute::Specification(AttributeSpecification {
                         ident: ident.clone(),
-                        entity_name: entity_name,
-                        entity_class: entity_class,
+                        entity_name,
+                        entity_class,
                         expr: expr.clone(),
                     })
                 }).collect()
diff --git a/vhdl_lang/src/syntax/design_unit.rs b/vhdl_lang/src/syntax/design_unit.rs
@@ -297,7 +297,7 @@ mod tests {
 
     fn to_single_entity(design_file: DesignFile) -> EntityDeclaration {
         match design_file.design_units.as_slice() {
-            &[AnyDesignUnit::Primary(AnyPrimaryUnit::Entity(ref entity))] => entity.to_owned(),
+            [AnyDesignUnit::Primary(AnyPrimaryUnit::Entity(ref entity))] => entity.to_owned(),
             _ => panic!("Expected single entity {:?}", design_file),
         }
     }
diff --git a/vhdl_lang/src/syntax/expression.rs b/vhdl_lang/src/syntax/expression.rs
@@ -278,7 +278,7 @@ fn parse_primary_initial_token(
         }
         Null => Ok(WithPos {
             item: Expression::Literal(Literal::Null),
-            pos: token.pos.clone(),
+            pos: token.pos,
         }),
         New => {
             let alloc = parse_allocator(stream)?;
diff --git a/vhdl_lang/src/syntax/names.rs b/vhdl_lang/src/syntax/names.rs
@@ -181,7 +181,7 @@ fn parse_function_call(
                     item: Name::FunctionCall(Box::new(FunctionCall {
                         name: prefix,
                         parameters: association_elements})),
-                    pos: pos,
+                    pos,
                 });
             }
         )
@@ -386,18 +386,18 @@ pub fn parse_name_initial_token(
 
                         name = WithPos {
                             item: Name::Slice(Box::new(name), Box::new(discrete_range)),
-                            pos: pos,
+                            pos,
                         };
                     },
                     RightPar => {
                         let pos = sep_token.pos.combine_into(&name);
                         name = WithPos {
                             item: Name::FunctionCall(Box::new(
                                 FunctionCall {
-                                    name: name,
+                                    name,
                                     parameters: vec![assoc]
                                 })),
-                            pos: pos,
+                            pos,
                         };
                     }
                 )
@@ -434,6 +434,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::blacklisted_name)]
     fn test_parse_selected_name_multiple() {
         let code = Code::new("foo.bar.baz");
         let baz = code
@@ -516,6 +517,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::blacklisted_name)]
     fn test_selected_name() {
         let code = Code::new("foo.bar.baz");
 
@@ -548,6 +550,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::blacklisted_name)]
     fn test_selected_name_all() {
         let code = Code::new("foo.all");
 
@@ -710,6 +713,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::blacklisted_name)]
     fn test_function_call_no_formal() {
         let code = Code::new("foo(0)");
 
@@ -783,6 +787,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::blacklisted_name)]
     fn test_function_call() {
         let code = Code::new("foo(arg => 0)");
 
diff --git a/vhdl_lang/src/syntax/subtype_indication.rs b/vhdl_lang/src/syntax/subtype_indication.rs
@@ -163,7 +163,7 @@ pub fn parse_element_resolution_indication(
                 };
 
                 element_resolutions.push(RecordElementResolution {
-                    ident: ident,
+                    ident,
                     resolution: Box::new(resolution),
                 });
 
diff --git a/vhdl_lang/src/syntax/test.rs b/vhdl_lang/src/syntax/test.rs
@@ -469,11 +469,11 @@ fn forward(stream: &mut TokenStream, start: Position) {
 }
 
 /// Check that no errors where found
-pub fn check_no_diagnostics(diagnostics: &Vec<Diagnostic>) {
+pub fn check_no_diagnostics(diagnostics: &[Diagnostic]) {
     for err in diagnostics.iter() {
         println!("{}", err.show());
     }
-    if diagnostics.len() > 0 {
+    if !diagnostics.is_empty() {
         panic!("Found errors");
     }
 }
diff --git a/vhdl_lang/src/syntax/tokens/tokenizer.rs b/vhdl_lang/src/syntax/tokens/tokenizer.rs
@@ -1641,7 +1641,7 @@ mod tests {
     }
 
     fn kinds(tokens: &[Token]) -> Vec<Kind> {
-        tokens.iter().map(|ref tok| tok.kind.clone()).collect()
+        tokens.iter().map(|ref tok| tok.kind).collect()
     }
 
     // Shorthand for testing
@@ -1654,7 +1654,7 @@ mod tests {
         Code::new(code)
             .tokenize()
             .iter()
-            .map(|tok| (tok.kind.clone(), tok.value.clone()))
+            .map(|tok| (tok.kind, tok.value.clone()))
             .collect()
     }
 
@@ -1933,12 +1933,13 @@ end entity"
     }
 
     #[test]
+    #[allow(clippy::approx_constant)]
     fn tokenize_real_truncates_precision() {
         assert_eq!(
             kind_value_tokenize("2.71828182845904523536"),
             vec![(
                 AbstractLiteral,
-                Value::AbstractLiteral(ast::AbstractLiteral::Real(2.7182818284590452))
+                Value::AbstractLiteral(ast::AbstractLiteral::Real(2.718_281_828_459_045))
             )]
         );
     }
@@ -2078,7 +2079,7 @@ end entity"
                             kind: BitString,
                             value: Value::BitString(ast::BitString {
                                 length: length_opt,
-                                base: base,
+                                base,
                                 value: Latin1String::from_utf8_unchecked(value.as_str())
                             }),
                             pos: code.pos(),
@@ -2134,7 +2135,7 @@ end entity"
             kind_value_tokenize("16#eEFfa#"),
             vec![(
                 AbstractLiteral,
-                Value::AbstractLiteral(ast::AbstractLiteral::Integer(0xeEffa))
+                Value::AbstractLiteral(ast::AbstractLiteral::Integer(0xeeffa))
             ),]
         );
     }
diff --git a/vhdl_lang/src/syntax/type_declaration.rs b/vhdl_lang/src/syntax/type_declaration.rs
@@ -688,7 +688,7 @@ end protected body;
         assert_eq!(
             code.with_stream_no_diagnostics(parse_type_declaration),
             TypeDeclaration {
-                ident: ident.clone(),
+                ident,
                 def: TypeDefinition::ProtectedBody(ProtectedTypeBody {
                     type_reference: Reference::default(),
                     decl
diff --git a/vhdl_ls/src/rpc_channel.rs b/vhdl_ls/src/rpc_channel.rs
@@ -141,7 +141,7 @@ pub mod test_support {
         fn drop(&mut self) {
             if !std::thread::panicking() {
                 let expected = self.expected.replace(VecDeque::new());
-                if expected.len() > 0 {
+                if !expected.is_empty() {
                     panic!("Not all expected data was consumed\n{:#?}", expected);
                 }
             }
diff --git a/vhdl_ls/src/vhdl_server.rs b/vhdl_ls/src/vhdl_server.rs

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ impl LibraryBuilder {`
`29`	`29`	`let library_name = self.code_builder.symbol(library_name);`
`30`	`30`	`match self.libraries.entry(library_name) {`
`31`	`31`	`Entry::Occupied(mut entry) => {`
`32`		`- entry.get_mut().push(code.clone());`
	`32`	`+ entry.get_mut().push(code);`
`33`	`33`	`}`
`34`	`34`	`Entry::Vacant(entry) => {`
`35`		`- entry.insert(vec![code.clone()]);`
	`35`	`+ entry.insert(vec![code]);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
`@@ -102,7 +102,7 @@ pub fn add_standard_library(symbols: Arc<Symbols>, root: &mut DesignRoot) {`
`102`	`102`
`103`	`103`	`root.add_design_file(std_sym.clone(), std_standard.design_file());`
`104`	`104`	`root.add_design_file(std_sym.clone(), std_textio.design_file());`
`105`		`- root.add_design_file(std_sym.clone(), std_env.design_file());`
	`105`	`+ root.add_design_file(std_sym, std_env.design_file());`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`pub fn missing(code: &Code, name: &str, occ: usize) -> Diagnostic {`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,6 @@ fn is_literal(pattern: &str, is_windows: bool) -> bool {`
`311`	`311`	`mod tests {`
`312`	`312`	`use super::*;`
`313`	`313`	`use pretty_assertions::assert_eq;`
`314`		`- use tempfile;`
`315`	`314`
`316`	`315`	`/// Utility function to create an empty file in parent folder`
`317`	`316`	`fn touch(parent: &Path, file_name: &str) -> PathBuf {`
`@@ -444,7 +443,7 @@ lib3.files = [`
`444`	`443`	`)`
`445`	`444`	`.unwrap();`
`446`	`445`
`447`		`- let mut merged_config = config0.clone();`
	`446`	`+ let mut merged_config = config0;`
`448`	`447`	`merged_config.append(&config1, &mut Vec::new());`
`449`	`448`	`assert_eq!(merged_config, expected_config);`
`450`	`449`	`}`