discard trailing blank comments

[rust.git] / src / rewrite.rs

diff --git a/src/rewrite.rs b/src/rewrite.rs
index 7c7bb060fd3b8f97ae6ca4c090a73649d3da88c4..90b613df6c4026bdb7d20698124bf870f58b269b 100644 (file)
--- a/src/rewrite.rs
+++ b/src/rewrite.rs
@@ -39,7 +39,9 @@ pub struct RewriteContext<'a> {
     // When rewriting chain, veto going multi line except the last element
     pub force_one_line_chain: RefCell<bool>,
     pub snippet_provider: &'a SnippetProvider<'a>,
-    pub report: FormatReport,
+    // Used for `format_snippet`
+    pub(crate) macro_rewrite_failure: RefCell<bool>,
+    pub(crate) report: FormatReport,
 }
 
 impl<'a> RewriteContext<'a> {
@@ -53,7 +55,7 @@ pub fn use_block_indent(&self) -> bool {
     }
 
     pub fn budget(&self, used_width: usize) -> usize {
-        self.config.max_width().checked_sub(used_width).unwrap_or(0)
+        self.config.max_width().saturating_sub(used_width)
     }
 
     pub fn inside_macro(&self) -> bool {