diff --git a/src/font_collection_impl.rs b/src/font_collection_impl.rs index 8a9d68e..56c85d3 100644 --- a/src/font_collection_impl.rs +++ b/src/font_collection_impl.rs @@ -76,7 +76,7 @@ unsafe extern "system" fn CustomFontCollectionLoaderImpl_CreateEnumeratorFromKey out_enumerator: *mut *mut IDWriteFontFileEnumerator, ) -> HRESULT { let this = CustomFontCollectionLoaderImpl::from_interface(this); - let enumerator = CustomFontFileEnumeratorImpl::new((*this).font_files.clone()); + let enumerator = CustomFontFileEnumeratorImpl::new(this.font_files.clone()); let enumerator = ComPtr::::from_raw(enumerator.into_interface()); *out_enumerator = enumerator.as_raw(); mem::forget(enumerator); @@ -129,10 +129,10 @@ unsafe extern "system" fn CustomFontFileEnumeratorImpl_GetCurrentFontFile( out_font_file: *mut *mut IDWriteFontFile, ) -> HRESULT { let this = CustomFontFileEnumeratorImpl::from_interface(this); - if (*this).index < 0 || (*this).index >= (*this).font_files.len() as isize { + if this.index < 0 || this.index >= this.font_files.len() as isize { return E_INVALIDARG; } - let new_font_file = (*this).font_files[(*this).index as usize].clone(); + let new_font_file = this.font_files[this.index as usize].clone(); *out_font_file = new_font_file.as_raw(); mem::forget(new_font_file); S_OK @@ -144,11 +144,11 @@ unsafe extern "system" fn CustomFontFileEnumeratorImpl_MoveNext( has_current_file: *mut BOOL, ) -> HRESULT { let this = CustomFontFileEnumeratorImpl::from_interface(this); - let font_file_count = (*this).font_files.len() as isize; - if (*this).index < font_file_count { - (*this).index += 1 + let font_file_count = this.font_files.len() as isize; + if this.index < font_file_count { + this.index += 1 } - *has_current_file = if (*this).index >= 0 && (*this).index < font_file_count { + *has_current_file = if this.index >= 0 && this.index < font_file_count { TRUE } else { FALSE diff --git a/src/font_file.rs b/src/font_file.rs index 04ac7fb..e2d7a30 100644 --- a/src/font_file.rs +++ b/src/font_file.rs @@ -111,7 +111,7 @@ impl FontFile { } } self.face_type = face_type; - num_faces as u32 + num_faces } pub fn take(native: ComPtr) -> FontFile { diff --git a/src/font_file_loader_impl.rs b/src/font_file_loader_impl.rs index 6a3f22d..43e6d1b 100644 --- a/src/font_file_loader_impl.rs +++ b/src/font_file_loader_impl.rs @@ -22,7 +22,7 @@ use crate::com_helpers::*; struct FontFileLoader; -const FontFileLoaderVtbl: &'static IDWriteFontFileLoaderVtbl = &IDWriteFontFileLoaderVtbl { +const FontFileLoaderVtbl: &IDWriteFontFileLoaderVtbl = &IDWriteFontFileLoaderVtbl { parent: implement_iunknown!(static IDWriteFontFileLoader, FontFileLoader), CreateStreamFromKey: { unsafe extern "system" fn CreateStreamFromKey( @@ -83,7 +83,7 @@ struct FontFileStream { data: Arc>, } -const FontFileStreamVtbl: &'static IDWriteFontFileStreamVtbl = &IDWriteFontFileStreamVtbl { +const FontFileStreamVtbl: &IDWriteFontFileStreamVtbl = &IDWriteFontFileStreamVtbl { parent: implement_iunknown!(IDWriteFontFileStream, FontFileStream), ReadFileFragment: { unsafe extern "system" fn ReadFileFragment( diff --git a/src/geometry_sink_impl.rs b/src/geometry_sink_impl.rs index 2f2f755..eae7e12 100644 --- a/src/geometry_sink_impl.rs +++ b/src/geometry_sink_impl.rs @@ -64,7 +64,7 @@ unsafe extern "system" fn GeometrySinkImpl_BeginFigure( _: D2D1_FIGURE_BEGIN, ) { let this = GeometrySinkImpl::from_interface(this); - (*this) + this .outline_builder .move_to(start_point.x, start_point.y) } @@ -75,7 +75,7 @@ unsafe extern "system" fn GeometrySinkImpl_EndFigure( ) { let this = GeometrySinkImpl::from_interface(this); if figure_end == D2D1_FIGURE_END_CLOSED { - (*this).outline_builder.close() + this.outline_builder.close() } } @@ -87,7 +87,7 @@ unsafe extern "system" fn GeometrySinkImpl_AddLines( let this = GeometrySinkImpl::from_interface(this); let points = slice::from_raw_parts(points, points_count as usize); for point in points { - (*this).outline_builder.line_to(point.x, point.y) + this.outline_builder.line_to(point.x, point.y) } } @@ -99,7 +99,7 @@ unsafe extern "system" fn GeometrySinkImpl_AddBeziers( let this = GeometrySinkImpl::from_interface(this); let beziers = slice::from_raw_parts(beziers, beziers_count as usize); for bezier in beziers { - (*this).outline_builder.curve_to( + this.outline_builder.curve_to( bezier.point1.x, bezier.point1.y, bezier.point2.x, diff --git a/src/test.rs b/src/test.rs index 1396ab6..612a783 100644 --- a/src/test.rs +++ b/src/test.rs @@ -12,8 +12,7 @@ fn test_system_family_iter() { assert!(count > 0); assert!(system_fc .families_iter() - .find(|f| f.name() == "Arial") - .is_some()); + .any(|f| f.name() == "Arial")); } #[test] @@ -47,10 +46,10 @@ fn test_get_font_file_bytes() { ); let face = arial_font.create_font_face(); let files = face.get_files(); - assert!(files.len() > 0); + assert!(!files.is_empty()); let bytes = files[0].get_font_file_bytes(); - assert!(bytes.len() > 0); + assert!(!bytes.is_empty()); } #[test] @@ -86,10 +85,10 @@ fn test_create_font_file_from_bytes() { ); let face = arial_font.create_font_face(); let files = face.get_files(); - assert!(files.len() > 0); + assert!(!files.is_empty()); let bytes = files[0].get_font_file_bytes(); - assert!(bytes.len() > 0); + assert!(!bytes.is_empty()); // now go back let new_font = FontFile::new_from_data(Arc::new(bytes)); @@ -148,8 +147,8 @@ fn test_glyph_image() { let rp = RenderingParams::create_for_primary_monitor(); rt.set_pixels_per_dip(device_pixel_ratio); rt.draw_glyph_run( - x as f32, - y as f32, + x, + y, DWRITE_MEASURING_MODE_NATURAL, &face, em_size, diff --git a/src/text_analysis_source_impl.rs b/src/text_analysis_source_impl.rs index 44f8a65..70871bd 100644 --- a/src/text_analysis_source_impl.rs +++ b/src/text_analysis_source_impl.rs @@ -38,7 +38,7 @@ pub trait TextAnalysisSourceMethods { /// /// Return locale and length of text (in utf-16 code units) for which the /// locale is valid. - fn get_locale_name<'a>(&'a self, text_position: u32) -> (Cow<'a, str>, u32); + fn get_locale_name(&self, text_position: u32) -> (Cow<'_, str>, u32); /// Get the text direction for the paragraph. fn get_paragraph_reading_direction(&self) -> DWRITE_READING_DIRECTION; @@ -80,7 +80,7 @@ impl<'a> CustomTextAnalysisSourceImpl<'a> { inner: Box, text: Cow<'a, [wchar_t]>, ) -> CustomTextAnalysisSourceImpl<'a> { - assert!(text.len() <= (std::u32::MAX as usize)); + assert!(text.len() <= (u32::MAX as usize)); CustomTextAnalysisSourceImpl { _refcount: AtomicUsize::new(1), inner, @@ -100,7 +100,7 @@ impl<'a> CustomTextAnalysisSourceImpl<'a> { text: Cow<'a, [wchar_t]>, number_subst: NumberSubstitution, ) -> CustomTextAnalysisSourceImpl<'a> { - assert!(text.len() <= (std::u32::MAX as usize)); + assert!(text.len() <= (u32::MAX as usize)); CustomTextAnalysisSourceImpl { _refcount: AtomicUsize::new(1), inner, diff --git a/src/types.rs b/src/types.rs index d488a08..6429fdc 100644 --- a/src/types.rs +++ b/src/types.rs @@ -41,7 +41,7 @@ impl FontWeight { FontWeight::ExtraBold=> 800, FontWeight::Black=> 900, FontWeight::ExtraBlack=> 950, - FontWeight::Unknown(v) => *v as u32 + FontWeight::Unknown(v) => { *v } } } pub fn from_u32(v: u32) -> FontWeight {