Bump minimum supported Rust version to 1.32.0

.travis.yml

@@ -12,7 +12,7 @@ os:
   - windows
 
 rust:
-  - 1.31.0
+  - 1.32.0
   - stable
   - nightly
 

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The xclip dependency has been removed
 - On macOS, Alacritty now requests NSSystemAdministrationUsageDescription to
    avoid permission failures
+- Minimum Rust version has been bumped to 1.32.0
 
 ### Added
 

CONTRIBUTING.md

@@ -63,7 +63,7 @@ All patches have to be sent on Github as [pull requests](https://github.com/jwil
 
 If you are looking for a place to start contributing to Alacritty, take a look at the [help wanted](https://github.com/jwilm/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) and [easy](https://github.com/jwilm/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22D+-+easy%22) issues.
 
-Please note that the minimum supported version of Alacritty is Rust 1.31.0. All patches are expected to work with the minimum supported version.
+Please note that the minimum supported version of Alacritty is Rust 1.32.0. All patches are expected to work with the minimum supported version.
 
 ### Testing
 

alacritty/Cargo.toml

@@ -18,7 +18,7 @@ crossbeam-channel = "0.3.8"
 serde_yaml = "0.8"
 
 [build-dependencies]
-rustc_tools_util = "0.1"
+rustc_tools_util = "0.2.0"
 
 [target.'cfg(not(windows))'.dependencies]
 xdg = "2"

font/Cargo.toml

@@ -8,7 +8,7 @@ license = "Apache-2.0"
 [dependencies]
 euclid = "0.19.2"
 libc = "0.2"
-foreign-types = "0.3"
+foreign-types = "0.4"
 log = "0.4"
 
 [target.'cfg(not(any(target_os = "macos", windows)))'.dependencies]

font/src/ft/fc/char_set.rs

@@ -11,16 +11,18 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+use std::ptr::NonNull;
+
 use foreign_types::ForeignTypeRef;
 
 use super::ffi::FcCharSetCreate;
 use super::ffi::{FcCharSet, FcCharSetAddChar, FcCharSetDestroy};
 
 foreign_type! {
-    type CType = FcCharSet;
+    pub type CharSet {
-    fn drop = FcCharSetDestroy;
+        type CType = FcCharSet;
-    pub struct CharSet;
+        fn drop = FcCharSetDestroy;
-    pub struct CharSetRef;
+    }
 }
 
 impl CharSet {
@@ -31,7 +33,7 @@ impl CharSet {
 
 impl Default for CharSet {
     fn default() -> Self {
-        CharSet(unsafe { FcCharSetCreate() })
+        CharSet(unsafe { NonNull::new(FcCharSetCreate()).unwrap() })
     }
 }
 

font/src/ft/fc/config.rs

@@ -17,12 +17,10 @@ use super::ffi::{FcConfig, FcConfigDestroy, FcConfigGetCurrent, FcConfigGetFonts
 use super::{FontSetRef, SetName};
 
 foreign_type! {
-    type CType = FcConfig;
+    pub type Config {
-    fn drop = FcConfigDestroy;
+        type CType = FcConfig;
-    /// Wraps an FcConfig instance (owned)
+        fn drop = FcConfigDestroy;
-    pub struct Config;
+    }
-    /// Wraps an FcConfig reference (borrowed)
-    pub struct ConfigRef;
 }
 
 impl Config {

font/src/ft/fc/font_set.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 use std::ops::Deref;
+use std::ptr::NonNull;
 
 use foreign_types::{ForeignType, ForeignTypeRef};
 
@@ -20,12 +21,10 @@ use super::{ConfigRef, ObjectSetRef, PatternRef};
 use super::ffi::{FcFontSet, FcFontSetDestroy, FcFontSetList};
 
 foreign_type! {
-    type CType = FcFontSet;
+    pub type FontSet {
-    fn drop = FcFontSetDestroy;
+        type CType = FcFontSet;
-    /// Wraps an FcFontSet instance (owned)
+        fn drop = FcFontSetDestroy;
-    pub struct FontSet;
+    }
-    /// Wraps an FcFontSet reference (borrowed)
-    pub struct FontSetRef;
 }
 
 impl FontSet {
@@ -44,7 +43,7 @@ impl FontSet {
                 objects.as_ptr(),
             )
         };
-        FontSet(raw)
+        FontSet(NonNull::new(raw).unwrap())
     }
 }
 

font/src/ft/fc/object_set.rs

@@ -11,16 +11,18 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+use std::ptr::NonNull;
+
 use libc::c_char;
 
 use super::ffi::{FcObjectSet, FcObjectSetAdd, FcObjectSetCreate, FcObjectSetDestroy};
 use foreign_types::ForeignTypeRef;
 
 foreign_type! {
-    type CType = FcObjectSet;
+    pub type ObjectSet {
-    fn drop = FcObjectSetDestroy;
+        type CType = FcObjectSet;
-    pub struct ObjectSet;
+        fn drop = FcObjectSetDestroy;
-    pub struct ObjectSetRef;
+    }
 }
 
 impl ObjectSet {
@@ -31,7 +33,7 @@ impl ObjectSet {
 
 impl Default for ObjectSet {
     fn default() -> Self {
-        ObjectSet(unsafe { FcObjectSetCreate() })
+        ObjectSet(unsafe { NonNull::new(FcObjectSetCreate()).unwrap() })
     }
 }
 

font/src/ft/fc/pattern.rs

@@ -15,7 +15,7 @@ use std::ffi::{CStr, CString};
 use std::fmt;
 use std::mem;
 use std::path::PathBuf;
-use std::ptr;
+use std::ptr::{self, NonNull};
 use std::str;
 
 use foreign_types::{ForeignType, ForeignTypeRef};
@@ -326,10 +326,10 @@ impl_derived_property_iter! {
 }
 
 foreign_type! {
-    type CType = FcPattern;
+    pub type Pattern {
-    fn drop = FcPatternDestroy;
+        type CType = FcPattern;
-    pub struct Pattern;
+        fn drop = FcPatternDestroy;
-    pub struct PatternRef;
+    }
 }
 
 macro_rules! string_accessor {
@@ -360,7 +360,7 @@ impl Pattern {
 
 impl Default for Pattern {
     fn default() -> Self {
-        Pattern(unsafe { FcPatternCreate() })
+        Pattern(unsafe { NonNull::new(FcPatternCreate()).unwrap() })
     }
 }