diff --git a/build/build.rs b/build/build.rs index 26bb1eb..06ba587 100644 --- a/build/build.rs +++ b/build/build.rs @@ -37,7 +37,6 @@ fn main() -> Result<(), Box> { let mut file = File::create(generated_dir.join("mod.rs")).ok().unwrap(); file.write_all("// The contents of this file are automatically generated and should not be modified directly. See the `build` directory. -#[allow(clippy::all)] pub mod entities; pub mod header; pub mod objects; diff --git a/clippy.toml b/clippy.toml new file mode 100644 index 0000000..ccb97a3 --- /dev/null +++ b/clippy.toml @@ -0,0 +1 @@ +doc-valid-idents = ["AutoCAD", "PostScript", ".."] diff --git a/spec/TableSpec.xml b/spec/TableSpec.xml index 796363e..3a2d059 100644 --- a/spec/TableSpec.xml +++ b/spec/TableSpec.xml @@ -107,7 +107,7 @@ - + diff --git a/src/block.rs b/src/block.rs index 34f33c9..09575fa 100644 --- a/src/block.rs +++ b/src/block.rs @@ -706,7 +706,7 @@ mod tests { } } - /// Test case derived from https://ezdxf.readthedocs.io/en/stable/dxfinternals/block_management.html + /// Test case derived from #[test] fn write_block_r12_compat() { let mut drawing = Drawing::new(); diff --git a/src/code_pair_put_back.rs b/src/code_pair_put_back.rs index 4bd0a1d..4e668ca 100644 --- a/src/code_pair_put_back.rs +++ b/src/code_pair_put_back.rs @@ -27,7 +27,7 @@ impl Iterator for CodePairPutBack { loop { let pair = self.iter.next(); match pair { - Some(Ok(CodePair { code, .. })) if code == 999 => (), // a 999 comment code, try again + Some(Ok(CodePair { code: 999, .. })) => (), // a 999 comment code, try again _ => return pair, } } diff --git a/src/lib.rs b/src/lib.rs index 0e4cd6c..ec579b8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -113,6 +113,8 @@ //! () //! +#![warn(clippy::doc_markdown)] + extern crate encoding_rs; #[macro_use] diff --git a/src/misc_tests/encoding.rs b/src/misc_tests/encoding.rs index adc5907..93b151e 100644 --- a/src/misc_tests/encoding.rs +++ b/src/misc_tests/encoding.rs @@ -12,7 +12,7 @@ use self::image::{DynamicImage, GenericImageView}; #[test] fn read_string_with_control_characters() { let drawing = parse_drawing( - vec![ + [ "0", "SECTION", "2", @@ -68,7 +68,7 @@ fn unsupported_section() { #[test] fn read_lf_and_crlf() { - let code_pairs = vec![ + let code_pairs = [ "0", "SECTION", "2", "HEADER", "9", "$ACADVER", "1", "AC1027", "0", "ENDSEC", "0", "EOF", ]; @@ -440,7 +440,7 @@ fn write_unicode_as_ascii() { drawing.header.project_name = String::from("è"); assert_contains( &drawing, - vec![" 9", "$PROJECTNAME", " 1", "\\U+00E8"].join("\r\n"), + [" 9", "$PROJECTNAME", " 1", "\\U+00E8"].join("\r\n"), ); } @@ -449,10 +449,7 @@ fn write_unicode_as_utf8() { let mut drawing = Drawing::new(); drawing.header.version = AcadVersion::R2007; drawing.header.project_name = String::from("è"); - assert_contains( - &drawing, - vec![" 9", "$PROJECTNAME", " 1", "è"].join("\r\n"), - ); + assert_contains(&drawing, [" 9", "$PROJECTNAME", " 1", "è"].join("\r\n")); } #[test] diff --git a/src/misc_tests/integration.rs b/src/misc_tests/integration.rs index 216f26a..e56b500 100644 --- a/src/misc_tests/integration.rs +++ b/src/misc_tests/integration.rs @@ -32,7 +32,7 @@ impl Oda { pub fn convert_drawing(&self, drawing: &mut Drawing, version: AcadVersion) -> Drawing { drawing.header.version = version; drawing - .save_file(&format!("{}/drawing.dxf", self.input_path)) + .save_file(format!("{}/drawing.dxf", self.input_path)) .unwrap(); // e.g., // ODAFileConverter.exe input_dir output_dir ACAD2000 DXF 0 1 @@ -151,7 +151,7 @@ impl AutoCAD { pub fn convert_drawing(&self, drawing: &mut Drawing, version: AcadVersion) -> Drawing { drawing.header.version = version; drawing - .save_file(&format!("{}/input.dxf", self.temp_path)) + .save_file(format!("{}/input.dxf", self.temp_path)) .unwrap(); // e.g., // accoreconsole.exe /i /path/to/input.dxf /b script.scr diff --git a/src/object.rs b/src/object.rs index 9ed6ac4..dae0673 100644 --- a/src/object.rs +++ b/src/object.rs @@ -1553,7 +1553,7 @@ impl Object { )); } let code = if dict.is_hard_owner { 360 } else { 350 }; - for key in dict.value_handles.keys().sorted_by(|a, b| Ord::cmp(a, b)) { + for key in dict.value_handles.keys().sorted_by(Ord::cmp) { if let Some(value) = dict.value_handles.get(key) { pairs.push(CodePair::new_string(3, key)); pairs.push(CodePair::new_string(code, &value.as_string())); @@ -1569,7 +1569,7 @@ impl Object { )); } pairs.push(CodePair::new_string(340, &dict.default_handle.as_string())); - for key in dict.value_handles.keys().sorted_by(|a, b| Ord::cmp(a, b)) { + for key in dict.value_handles.keys().sorted_by(Ord::cmp) { if let Some(value) = dict.value_handles.get(key) { pairs.push(CodePair::new_string(3, key)); pairs.push(CodePair::new_string(350, &value.as_string()));