diff --git a/clippy.toml b/clippy.toml index ccb97a3..a463855 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -doc-valid-idents = ["AutoCAD", "PostScript", ".."] +doc-valid-idents = ["AutoCAD", "PostScript", "..", "DesignCenter", "PlotStyle", "DWFx"] diff --git a/src/block.rs b/src/block.rs index ee3c09b..487150d 100644 --- a/src/block.rs +++ b/src/block.rs @@ -37,7 +37,7 @@ pub struct Block { pub entities: Vec, /// Extension data groups. pub extension_data_groups: Vec, - /// XData. + /// `XData`. pub x_data: Vec, } diff --git a/src/dxb_reader.rs b/src/dxb_reader.rs index 36a6dda..aad363b 100644 --- a/src/dxb_reader.rs +++ b/src/dxb_reader.rs @@ -271,7 +271,7 @@ impl DxbReader { fn wrap_common_values(&self, specific: EntityType) -> Entity { let mut entity = Entity::new(specific); entity.common.color = self.current_color.clone(); - entity.common.layer = self.layer_name.clone(); + entity.common.layer.clone_from(&self.layer_name); entity } fn read_null_terminated_string(&mut self) -> DxfResult { diff --git a/src/entity.rs b/src/entity.rs index 8c759e9..20cbe5f 100644 --- a/src/entity.rs +++ b/src/entity.rs @@ -1743,7 +1743,7 @@ mod tests { common: Default::default(), specific: EntityType::Line(Default::default()), }; - ent.common.layer = "some-layer".to_owned(); + "some-layer".clone_into(&mut ent.common.layer); drawing.add_entity(ent); assert_contains_pairs( &drawing, @@ -1764,7 +1764,7 @@ mod tests { common: Default::default(), specific: EntityType::Line(Default::default()), }; - ent.common.layer = "some-layer".to_owned(); + "some-layer".clone_into(&mut ent.common.layer); drawing.add_entity(ent); assert_contains_pairs( &drawing, diff --git a/src/helper_functions.rs b/src/helper_functions.rs index e2b6850..7493cf6 100644 --- a/src/helper_functions.rs +++ b/src/helper_functions.rs @@ -612,7 +612,7 @@ pub mod tests { assert!(actual.contains(&contents)); } - fn try_find_index(superset: &Vec, subset: &Vec) -> Option + fn try_find_index(superset: &[T], subset: &[T]) -> Option where T: PartialEq, { @@ -634,7 +634,7 @@ pub mod tests { None } - pub fn assert_vec_contains(actual: &Vec, expected: &Vec) + pub fn assert_vec_contains(actual: &[T], expected: &[T]) where T: PartialEq, { diff --git a/src/misc_tests/encoding.rs b/src/misc_tests/encoding.rs index 93b151e..1e8bd9a 100644 --- a/src/misc_tests/encoding.rs +++ b/src/misc_tests/encoding.rs @@ -511,7 +511,7 @@ fn round_trip_thumbnail(thumbnail: image::DynamicImage) -> image::DynamicImage { let drawing_pairs = drawing.code_pairs().unwrap(); assert_vec_contains( &drawing_pairs, - &vec![ + &[ CodePair::new_str(0, "SECTION"), CodePair::new_str(2, "THUMBNAILIMAGE"), ], diff --git a/src/thumbnail.rs b/src/thumbnail.rs index e14f48c..a623061 100644 --- a/src/thumbnail.rs +++ b/src/thumbnail.rs @@ -73,7 +73,7 @@ fn read_thumbnail_bytes_from_code_pairs(iter: &mut CodePairPutBack) -> DxfResult Ok(Some(data)) } -fn update_thumbnail_data_offset_in_situ(data: &mut Vec) -> DxfResult { +fn update_thumbnail_data_offset_in_situ(data: &mut [u8]) -> DxfResult { // calculate the image data offset let dib_header_size = read_i32(data, FILE_HEADER_LENGTH)? as usize; @@ -240,7 +240,7 @@ fn test_get_u32() { assert_eq!(0x12345678, value); } -fn set_i32(data: &mut Vec, offset: usize, value: i32) -> DxfResult<()> { +fn set_i32(data: &mut [u8], offset: usize, value: i32) -> DxfResult<()> { let expected_length = offset + 4; if data.len() < expected_length { return Err(DxfError::UnexpectedEndOfInput);