From 51b2cac5940e8c7f3e7bbf1ac654bb79780fd14f Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Thu, 21 May 2020 12:11:15 +0200 Subject: [PATCH] remove use of deprecated item 'try': use the `?` operator instead Signed-off-by: Nikola Pajkovsky --- src/lib.rs | 3 +-- src/wand/drawing.rs | 16 ++++++++-------- src/wand/macros.rs | 24 ++++++++++++------------ src/wand/magick.rs | 12 ++++++------ src/wand/pixel.rs | 12 ++++++------ 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 67bce28..218028c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -69,8 +69,7 @@ pub fn magick_wand_terminus() { pub fn magick_query_fonts(pattern: &str) -> Result, &'static str> { let mut number_fonts: size_t = 0; - let c_string = - try!(::std::ffi::CString::new(pattern).map_err(|_| "could not convert to cstring")); + let c_string = ::std::ffi::CString::new(pattern).map_err(|_| "could not convert to cstring")?; let ptr = unsafe { bindings::MagickQueryFonts(c_string.as_ptr(), &mut number_fonts as *mut size_t) }; if ptr.is_null() { diff --git a/src/wand/drawing.rs b/src/wand/drawing.rs index c4ccc91..3c35a92 100644 --- a/src/wand/drawing.rs +++ b/src/wand/drawing.rs @@ -35,7 +35,7 @@ wand_common!( impl DrawingWand { pub fn draw_annotation(&mut self, x: f64, y: f64, text: &str) -> Result<(), &'static str> { - let c_string = try!(CString::new(text).map_err(|_| "could not convert to cstring")); + let c_string = CString::new(text).map_err(|_| "could not convert to cstring")?; unsafe { bindings::DrawAnnotation(self.wand, x, y, c_string.as_ptr() as *const _) }; Ok(()) } @@ -94,13 +94,13 @@ impl DrawingWand { impl fmt::Debug for DrawingWand { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(writeln!(f, "DrawingWand {{")); - try!(writeln!(f, " Exception: {:?}", self.get_exception())); - try!(writeln!(f, " IsWand: {:?}", self.is_wand())); - try!(self.fmt_unchecked_settings(f, " ")); - try!(self.fmt_string_settings(f, " ")); - try!(self.fmt_string_unchecked_settings(f, " ")); - try!(self.fmt_pixel_settings(f, " ")); + writeln!(f, "DrawingWand {{")?; + writeln!(f, " Exception: {:?}", self.get_exception())?; + writeln!(f, " IsWand: {:?}", self.is_wand())?; + self.fmt_unchecked_settings(f, " ")?; + self.fmt_string_settings(f, " ")?; + self.fmt_string_unchecked_settings(f, " ")?; + self.fmt_pixel_settings(f, " ")?; writeln!(f, "}}") } } diff --git a/src/wand/macros.rs b/src/wand/macros.rs index abbdcfe..f3660bc 100644 --- a/src/wand/macros.rs +++ b/src/wand/macros.rs @@ -118,7 +118,7 @@ macro_rules! set_get { } )* pub fn fmt_checked_settings(&self, f: &mut ::std::fmt::Formatter, prefix: &str) -> ::std::fmt::Result { - $( try!(writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get())); )* + $( writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get())?; )* Ok(()) } } @@ -135,7 +135,7 @@ macro_rules! set_get_unchecked { } )* pub fn fmt_unchecked_settings(&self, f: &mut ::std::fmt::Formatter, prefix: &str) -> ::std::fmt::Result { - $( try!(writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get())); )* + $( writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get()); )* Ok(()) } } @@ -154,7 +154,7 @@ macro_rules! string_get { Ok(result) } } - } + }; } macro_rules! string_set_get { @@ -162,7 +162,7 @@ macro_rules! string_set_get { $( string_get!($get, $c_get); pub fn $set(&mut self, s: &str) -> Result<(), &'static str> { - let c_string = try!(::std::ffi::CString::new(s).map_err(|_| "could not convert to cstring")); + let c_string = std::ffi::CString::new(s).map_err(|_| "could not convert to cstring")?; match unsafe { ::bindings::$c_set(self.wand, c_string.as_ptr()) } { ::bindings::MagickBooleanType_MagickTrue => Ok(()), _ => Err(concat!(stringify!($set), " returned false")) @@ -170,7 +170,7 @@ macro_rules! string_set_get { } )* pub fn fmt_string_settings(&self, f: &mut ::std::fmt::Formatter, prefix: &str) -> ::std::fmt::Result { - $( try!(writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get())); )* + $( writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get())?; )* Ok(()) } } @@ -181,13 +181,13 @@ macro_rules! string_set_get_unchecked { $( string_get!($get, $c_get); pub fn $set(&mut self, s: &str) -> Result<(), &'static str> { - let c_string = try!(::std::ffi::CString::new(s).map_err(|_| "could not convert to cstring")); + let c_string = ::std::ffi::CString::new(s).map_err(|_| "could not convert to cstring")?; unsafe { ::bindings::$c_set(self.wand, c_string.as_ptr()) }; Ok(()) } )* pub fn fmt_string_unchecked_settings(&self, f: &mut ::std::fmt::Formatter, prefix: &str) -> ::std::fmt::Result { - $( try!(writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get())); )* + $( writeln!(f, "{}{:<50}: {:?}", prefix, stringify!($c_get), self.$get())?; )* Ok(()) } } @@ -207,8 +207,8 @@ macro_rules! pixel_set_get { )* pub fn fmt_pixel_settings(&self, f: &mut ::std::fmt::Formatter, prefix: &str) -> ::std::fmt::Result { $( - try!(writeln!(f, "{}{:<50}: ", prefix, stringify!($c_get))); - try!(self.$get().fmt_w_prefix(f, &format!("{}{:<53}", prefix, " ") )); + writeln!(f, "{}{:<50}: ", prefix, stringify!($c_get))?; + self.$get().fmt_w_prefix(f, &format!("{}{:<53}", prefix, " ") )?; )* Ok(()) } @@ -235,14 +235,14 @@ macro_rules! color_set_get { } )* pub fn fmt_color_settings(&self, f: &mut ::std::fmt::Formatter, prefix: &str) -> ::std::fmt::Result { - try!(writeln!(f, "{}Color: {:?}, normalized: {:?}\n{}hsl: {:?}", + writeln!(f, "{}Color: {:?}, normalized: {:?}\n{}hsl: {:?}", prefix, self.get_color_as_string(), self.get_color_as_normalized_string(), prefix, self.get_hsl() - )); - $( try!(writeln!(f, "{}{:<10}: {:>} quantum: {}", prefix, stringify!($c_get).split_at(8).1, self.$get(), self.$get_quantum())); )* + )?; + $( writeln!(f, "{}{:<10}: {:>} quantum: {}", prefix, stringify!($c_get).split_at(8).1, self.$get(), self.$get_quantum())?; )* Ok(()) } } diff --git a/src/wand/magick.rs b/src/wand/magick.rs index 5afd34d..65dc164 100644 --- a/src/wand/magick.rs +++ b/src/wand/magick.rs @@ -75,7 +75,7 @@ impl MagickWand { angle: f64, text: &str, ) -> Result<(), &'static str> { - let c_string = try!(CString::new(text).map_err(|_| "could not convert to cstring")); + let c_string = CString::new(text).map_err(|_| "could not convert to cstring")?; match unsafe { bindings::MagickAnnotateImage( self.wand, @@ -841,11 +841,11 @@ impl MagickWand { impl fmt::Debug for MagickWand { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(writeln!(f, "MagickWand {{")); - try!(writeln!(f, " Exception: {:?}", self.get_exception())); - try!(writeln!(f, " IsWand: {:?}", self.is_wand())); - try!(self.fmt_string_settings(f, " ")); - try!(self.fmt_checked_settings(f, " ")); + writeln!(f, "MagickWand {{")?; + writeln!(f, " Exception: {:?}", self.get_exception())?; + writeln!(f, " IsWand: {:?}", self.is_wand())?; + self.fmt_string_settings(f, " ")?; + self.fmt_checked_settings(f, " ")?; writeln!(f, "}}") } } diff --git a/src/wand/pixel.rs b/src/wand/pixel.rs index 1cf6cdc..8d727d4 100644 --- a/src/wand/pixel.rs +++ b/src/wand/pixel.rs @@ -70,16 +70,16 @@ impl PixelWand { pub fn fmt_w_prefix(&self, f: &mut fmt::Formatter, prefix: &str) -> fmt::Result { let mut prf = prefix.to_string(); prf.push_str(" "); - try!(writeln!(f, "{}PixelWand {{", prefix)); - try!(writeln!(f, "{}Exception: {:?}", prf, self.get_exception())); - try!(writeln!(f, "{}IsWand: {:?}", prf, self.is_wand())); - try!(self.fmt_unchecked_settings(f, &prf)); - try!(self.fmt_color_settings(f, &prf)); + writeln!(f, "{}PixelWand {{", prefix)?; + writeln!(f, "{}Exception: {:?}", prf, self.get_exception())?; + writeln!(f, "{}IsWand: {:?}", prf, self.is_wand())?; + self.fmt_unchecked_settings(f, &prf)?; + self.fmt_color_settings(f, &prf)?; writeln!(f, "{}}}", prefix) } pub fn set_color(&mut self, s: &str) -> Result<(), &'static str> { - let c_string = try!(CString::new(s).map_err(|_| "could not convert to cstring")); + let c_string = CString::new(s).map_err(|_| "could not convert to cstring")?; match unsafe { bindings::PixelSetColor(self.wand, c_string.as_ptr()) } { bindings::MagickBooleanType_MagickTrue => Ok(()), _ => Err("failed to set color"),