From 7e88ed4d84ee22434635bcdc869bc1adfea5d368 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Thu, 11 Jul 2019 14:53:11 -0500 Subject: [PATCH] FIX: deprecated and unsafe code revealed by 1.36 rust release. --- src/ast/printer/mod.rs | 5 +++-- src/build/mod.rs | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ast/printer/mod.rs b/src/ast/printer/mod.rs index 6346ec7..61875bd 100644 --- a/src/ast/printer/mod.rs +++ b/src/ast/printer/mod.rs @@ -566,8 +566,9 @@ where for v in stmts { self.render_stmt(v)?; } - if let Some(last_comment_line) = self.comment_group_lines.first() { - self.render_missed_comments(*last_comment_line + 1)?; + let comment_line = self.comment_group_lines.first().cloned(); + if let Some(last_comment_line) = comment_line { + self.render_missed_comments(last_comment_line + 1)?; } Ok(()) } diff --git a/src/build/mod.rs b/src/build/mod.rs index 215bfbd..7aae5b8 100644 --- a/src/build/mod.rs +++ b/src/build/mod.rs @@ -223,12 +223,11 @@ where } Err(e) => { let err = simple_error::SimpleError::new( - format!( + &format!( "Error building file: {}\n{}", file.to_string_lossy(), e.as_ref() - ) - .as_ref(), + ), ); Err(Box::new(err)) }