From 28db52e97d703145ae202125f80572af874e9137 Mon Sep 17 00:00:00 2001 From: Fabian Freyer Date: Mon, 28 May 2018 12:59:11 +0000 Subject: [PATCH] Fix build on rustc <1.26 See: - https://github.com/rust-lang/rust/issues/42640 - https://blog.rust-lang.org/2018/05/10/Rust-1.26.html#nicer-match-bindings --- src/lib.rs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 4a8605ac..19c5f34d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -191,25 +191,25 @@ impl<'a> convert::From<&'a CtlValue> for CtlType { impl CtlType { fn min_type_size(self: &Self) -> usize { match self { - CtlType::None => 0, - CtlType::Node => 0, - CtlType::Int => mem::size_of::(), - CtlType::String => 0, - CtlType::S64 => mem::size_of::(), - CtlType::Struct => 0, - CtlType::Uint => mem::size_of::(), - CtlType::Long => mem::size_of::(), - CtlType::Ulong => mem::size_of::(), - CtlType::U64 => mem::size_of::(), - CtlType::U8 => mem::size_of::(), - CtlType::U16 => mem::size_of::(), - CtlType::S8 => mem::size_of::(), - CtlType::S16 => mem::size_of::(), - CtlType::S32 => mem::size_of::(), - CtlType::U32 => mem::size_of::(), + &CtlType::None => 0, + &CtlType::Node => 0, + &CtlType::Int => mem::size_of::(), + &CtlType::String => 0, + &CtlType::S64 => mem::size_of::(), + &CtlType::Struct => 0, + &CtlType::Uint => mem::size_of::(), + &CtlType::Long => mem::size_of::(), + &CtlType::Ulong => mem::size_of::(), + &CtlType::U64 => mem::size_of::(), + &CtlType::U8 => mem::size_of::(), + &CtlType::U16 => mem::size_of::(), + &CtlType::S8 => mem::size_of::(), + &CtlType::S16 => mem::size_of::(), + &CtlType::S32 => mem::size_of::(), + &CtlType::U32 => mem::size_of::(), // Added custom types below #[cfg(not(target_os = "macos"))] - CtlType::Temperature => 0, + &CtlType::Temperature => 0, } } }