seoxi/magick-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove use of deprecated item 'try': use the ? operator instead

Browse Source 
Signed-off-by: Nikola Pajkovsky <nikola.pajkovsky@livesporttv.cz>
This commit is contained in:
Nikola Pajkovsky
2020-05-21 12:11:15 +02:00
parent 415ad30bd0
commit 51b2cac594
5 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wand/drawing.rs
View File

@ -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, "}}")
}
}