diff --git a/core-text/src/font.rs b/core-text/src/font.rs index b483c16..8b77b08 100644 --- a/core-text/src/font.rs +++ b/core-text/src/font.rs @@ -387,7 +387,7 @@ impl CTFont { advances: *mut CGSize, count: CFIndex, ) -> f64 { - CTFontGetAdvancesForGlyphs(self.0, orientation, glyphs, advances, count) as f64 + CTFontGetAdvancesForGlyphs(self.0, orientation, glyphs, advances, count) } pub unsafe fn get_vertical_translations_for_glyphs( @@ -980,8 +980,8 @@ fn equal_descriptor_different_font() { // but we can still construct the CGFont by name let create_vars = |desc| { - let mut vals: Vec<(CFNumber, CFNumber)> = Vec::new(); - vals.push((CFNumber::from(0x6f70737a), CFNumber::from(17.))); + let vals: Vec<(CFNumber, CFNumber)> = + vec![(CFNumber::from(0x6f70737a), CFNumber::from(17.))]; let vals_dict = CFDictionary::from_CFType_pairs(&vals); let attrs_dict = CFDictionary::from_CFType_pairs(&[(variation_attribute.clone(), vals_dict)]); @@ -1081,8 +1081,8 @@ fn system_font_variation() { let cgfont = new_from_CGFont(&cgfont, 0.); let desc = cgfont.copy_descriptor(); - let mut vals: Vec<(CFNumber, CFNumber)> = Vec::new(); - vals.push((CFNumber::from(0x6f70737a /* opsz */), CFNumber::from(17.))); + let vals: Vec<(CFNumber, CFNumber)> = + vec![(CFNumber::from(0x6f70737a /* opsz */), CFNumber::from(17.))]; let vals_dict = CFDictionary::from_CFType_pairs(&vals); let variation_attribute = unsafe { CFString::wrap_under_get_rule(font_descriptor::kCTFontVariationAttribute) }; diff --git a/io-surface/src/lib.rs b/io-surface/src/lib.rs index a6d9a78..a530e2b 100644 --- a/io-surface/src/lib.rs +++ b/io-surface/src/lib.rs @@ -155,7 +155,7 @@ impl IOSurface { let height = IOSurfaceGetHeight(surface); let stride = IOSurfaceGetBytesPerRow(surface); - let size = (height * stride) as usize; + let size = height * stride; let address = IOSurfaceGetBaseAddress(surface) as *mut u8; let dest: &mut [u8] = slice::from_raw_parts_mut(address, size); dest.clone_from_slice(data);