Skip to content
This repository was archived by the owner on Jul 10, 2023. It is now read-only.

Commit 91227a0

Browse files
author
bors-servo
authored
Auto merge of #64 - Ketsuban:master, r=jdm
Deal with two ultra-trivial warnings I was too lazy to set git up and clone the repo locally, so these are the only warnings from the mondo list in #62 that I could do anything about right now. I'd like to get to at least some of the rest—the private-type-in-public-interface ones seem at first glance to be pretty doable, but I'd need to be able to run the compiler over the code to check for cascades. (The fact I did this entirely in the Github UI also means I couldn't squash the two commits myself. Sorry.) <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/core-text-rs/64) <!-- Reviewable:end -->
2 parents 39bce8d + 32a02b5 commit 91227a0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/font.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ impl CTFont {
307307
pub fn get_bounding_rects_for_glyphs(&self, orientation: CTFontOrientation, glyphs: &[CGGlyph])
308308
-> CGRect {
309309
unsafe {
310-
let mut result = CTFontGetBoundingRectsForGlyphs(self.as_concrete_TypeRef(),
311-
orientation,
312-
glyphs.as_ptr(),
313-
ptr::null_mut(),
314-
glyphs.len() as CFIndex);
310+
let result = CTFontGetBoundingRectsForGlyphs(self.as_concrete_TypeRef(),
311+
orientation,
312+
glyphs.as_ptr(),
313+
ptr::null_mut(),
314+
glyphs.len() as CFIndex);
315315
result
316316
}
317317
}

src/font_descriptor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ impl CTFontDescriptor {
274274
pub fn font_path(&self) -> Option<String> {
275275
unsafe {
276276
let value = CTFontDescriptorCopyAttribute(self.obj, kCTFontURLAttribute);
277-
if (value.is_null()) {
277+
if value.is_null() {
278278
return None;
279279
}
280280

0 commit comments

Comments
 (0)