From 6db97b35d8b39c13fb145c930250a5682780e4a5 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 31 Jan 2022 10:56:57 -0800 Subject: [PATCH] Allow any line to have at least 60 chars --- compiler/rustc_ast_pretty/src/pp.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/rustc_ast_pretty/src/pp.rs b/compiler/rustc_ast_pretty/src/pp.rs index 3e1b6e35170..26d600cefc7 100644 --- a/compiler/rustc_ast_pretty/src/pp.rs +++ b/compiler/rustc_ast_pretty/src/pp.rs @@ -136,6 +136,7 @@ mod ring; use ring::RingBuffer; use std::borrow::Cow; +use std::cmp; use std::collections::VecDeque; use std::iter; @@ -201,6 +202,8 @@ const SIZE_INFINITY: isize = 0xffff; /// Target line width. const MARGIN: isize = 78; +/// Every line is allowed at least this much space, even if highly indented. +const MIN_SPACE: isize = 60; pub struct Printer { out: String, @@ -420,7 +423,7 @@ impl Printer { self.out.push('\n'); let indent = self.indent as isize + token.offset; self.pending_indentation = indent; - self.space = MARGIN - indent; + self.space = cmp::max(MARGIN - indent, MIN_SPACE); } }