Merge pull request #1351 from sdroege/0.19-backports

0.19 backports

.typos.toml

@@ -14,3 +14,4 @@ ue = "ue"
 ot = "ot"
 siz = "siz"
 vai = "vai"
+guid = "guid"

cairo/src/font/font_options.rs

@@ -2,9 +2,9 @@
 
 #[cfg(feature = "v1_16")]
 use std::ffi::CString;
+use std::hash;
 #[cfg(not(feature = "use_glib"))]
 use std::ptr;
-use std::{cmp::PartialEq, hash};
 
 #[cfg(feature = "use_glib")]
 use glib::translate::*;

cairo/src/image_surface.rs

@@ -1,7 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use std::{
-    convert::TryFrom,
     ops::{Deref, DerefMut},
     rc::Rc,
     slice,

cairo/src/patterns.rs

@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::{convert::TryFrom, ops::Deref, ptr};
+use std::{ops::Deref, ptr};
 
 use libc::{c_double, c_int, c_uint};
 

cairo/src/pdf.rs

@@ -1,7 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use std::{
-    convert::TryFrom,
     ffi::{CStr, CString},
     io, mem,
     ops::Deref,

cairo/src/ps.rs

@@ -1,7 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use std::{
-    convert::TryFrom,
     ffi::{CStr, CString},
     io, mem,
     ops::Deref,

cairo/src/quartz_surface.rs

@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::{convert::TryFrom, fmt, ops::Deref};
+use std::{fmt, ops::Deref};
 
 use ffi::CGContextRef;
 #[cfg(feature = "use_glib")]

cairo/src/recording_surface.rs

@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::{convert::TryFrom, ops::Deref};
+use std::ops::Deref;
 
 #[cfg(feature = "use_glib")]
 use glib::translate::*;

cairo/src/svg.rs

@@ -3,7 +3,6 @@
 #[cfg(not(windows))]
 use std::os::unix::prelude::*;
 use std::{
-    convert::TryFrom,
     ffi::{CStr, CString},
     io, mem,
     ops::Deref,

cairo/src/user_data.rs

@@ -20,6 +20,12 @@ impl<T> UserDataKey<T> {
     }
 }
 
+impl<T> Default for UserDataKey<T> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 // In a safe API for user data we can’t make `get_user_data`
 // transfer full ownership of the value to the caller (e.g. by returning `Box<T>`)
 // because `self` still has a pointer to that value

cairo/src/win32_surface.rs

@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::{convert::TryFrom, ops::Deref};
+use std::ops::Deref;
 
 pub use ffi::windows;
 #[cfg(feature = "use_glib")]

cairo/src/xcb.rs

@@ -2,7 +2,7 @@
 
 #[cfg(feature = "use_glib")]
 use std::marker::PhantomData;
-use std::{convert::TryFrom, ops::Deref, ptr};
+use std::{ops::Deref, ptr};
 
 #[cfg(feature = "use_glib")]
 use glib::translate::*;