FIX: deprecated and unsafe code revealed by 1.36 rust release.

This commit is contained in:
Jeremy Wall 2019-07-11 14:53:11 -05:00
parent 368c153c9e
commit 7e88ed4d84
2 changed files with 5 additions and 5 deletions

View File

@ -566,8 +566,9 @@ where
for v in stmts { for v in stmts {
self.render_stmt(v)?; self.render_stmt(v)?;
} }
if let Some(last_comment_line) = self.comment_group_lines.first() { let comment_line = self.comment_group_lines.first().cloned();
self.render_missed_comments(*last_comment_line + 1)?; if let Some(last_comment_line) = comment_line {
self.render_missed_comments(last_comment_line + 1)?;
} }
Ok(()) Ok(())
} }

View File

@ -223,12 +223,11 @@ where
} }
Err(e) => { Err(e) => {
let err = simple_error::SimpleError::new( let err = simple_error::SimpleError::new(
format!( &format!(
"Error building file: {}\n{}", "Error building file: {}\n{}",
file.to_string_lossy(), file.to_string_lossy(),
e.as_ref() e.as_ref()
) ),
.as_ref(),
); );
Err(Box::new(err)) Err(Box::new(err))
} }