From b10390ede89c3b62c12a1b7b67c5440f8678c76b Mon Sep 17 00:00:00 2001
From: Chet Gurevitch <chetgurevitch@protonmail.com>
Date: Wed, 18 Oct 2017 19:54:41 -0700
Subject: Update euclid to v16

---
 font/src/darwin/mod.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'font/src')

diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs
index 53f78e4b..97f02553 100644
--- a/font/src/darwin/mod.rs
+++ b/font/src/darwin/mod.rs
@@ -38,9 +38,7 @@ use core_text::font_descriptor::kCTFontVerticalOrientation;
 use core_text::font_descriptor::{CTFontDescriptor, CTFontDescriptorRef, CTFontOrientation};
 use core_text::font_descriptor::SymbolicTraitAccessors;
 
-use euclid::point::Point2D;
-use euclid::rect::Rect;
-use euclid::size::Size2D;
+use euclid::{Point2D, Rect, Size2D};
 
 use super::{FontDesc, RasterizedGlyph, Metrics, FontKey, GlyphKey};
 
@@ -309,7 +307,7 @@ fn cascade_list_for_languages(
 ) -> Vec<Descriptor> {
 
     // convert language type &Vec<String> -> CFArray
-    let langarr:CFArray = {
+    let langarr:CFArray<CFString> = {
         let tmp:Vec<CFString> = languages.iter()
             .map(|language| CFString::new(&language))
             .collect();
@@ -317,7 +315,7 @@ fn cascade_list_for_languages(
     };
 
     // CFArray of CTFontDescriptorRef (again)
-    let list = ct_cascade_list_for_languages(ct_font, &langarr);
+    let list = ct_cascade_list_for_languages(ct_font, &langarr.as_untyped());
 
     // convert CFArray to Vec<Descriptor>
     list.into_iter()
-- 
cgit v1.2.3-54-g00ecf