Use trim_tries to extract post comment over simple trim_matches

[rust.git] / src / items.rs

diff --git a/src/items.rs b/src/items.rs
index 51f11d8f58aef9b556de32f4c1a737ad84eeede7..7f8980dd15068fc6d1a6f8aae7be54a406314539 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -20,7 +20,6 @@
 use syntax::visit;
 use syntax::{ast, ptr, symbol};
 
-use source_map::{LineRangeUtils, SpanUtils};
 use comment::{
     combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
     recover_missing_comment_in_span, rewrite_missing_comment, FindUncommented,
@@ -35,6 +34,7 @@
 use overflow;
 use rewrite::{Rewrite, RewriteContext};
 use shape::{Indent, Shape};
+use source_map::{LineRangeUtils, SpanUtils};
 use spanned::Spanned;
 use utils::*;
 use vertical::rewrite_with_alignment;
@@ -2232,8 +2232,10 @@ fn rewrite_args(
 ) -> Option<String> {
     let mut arg_item_strs = args
         .iter()
-        .map(|arg| arg.rewrite(context, Shape::legacy(multi_line_budget, arg_indent)))
-        .collect::<Option<Vec<_>>>()?;
+        .map(|arg| {
+            arg.rewrite(context, Shape::legacy(multi_line_budget, arg_indent))
+                .unwrap_or_else(|| context.snippet(arg.span()).to_owned())
+        }).collect::<Vec<_>>();
 
     // Account for sugary self.
     // FIXME: the comment for the self argument is dropped. This is blocked