Fix whitespace in pretty printed PatKind::Range

dtolnay · dtolnay · commit bc1a1ff3c86a · 2021-12-29T13:02:14.000-08:00
diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs
@@ -2515,7 +2515,6 @@ impl<'a> State<'a> {
             PatKind::Range(ref begin, ref end, Spanned { node: ref end_kind, .. }) => {
                 if let Some(e) = begin {
                     self.print_expr(e);
-                    self.space();
                 }
                 match *end_kind {
                     RangeEnd::Included(RangeSyntax::DotDotDot) => self.word("..."),
diff --git a/compiler/rustc_hir_pretty/src/lib.rs b/compiler/rustc_hir_pretty/src/lib.rs
@@ -1948,7 +1948,6 @@ impl<'a> State<'a> {
             PatKind::Range(ref begin, ref end, ref end_kind) => {
                 if let Some(expr) = begin {
                     self.print_expr(expr);
-                    self.space();
                 }
                 match *end_kind {
                     RangeEnd::Included => self.word("..."),
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.stderr b/src/test/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.stderr
@@ -2,7 +2,7 @@ error: the range pattern here has ambiguous interpretation
   --> $DIR/half-open-range-pats-ref-ambiguous-interp.rs:8:10
    |
 LL |         &0.. | _ => {}
-   |          ^^^ help: add parentheses to clarify the precedence: `(0 ..)`
+   |          ^^^ help: add parentheses to clarify the precedence: `(0..)`
 
 error[E0586]: inclusive range with no end
   --> $DIR/half-open-range-pats-ref-ambiguous-interp.rs:10:11
@@ -16,7 +16,7 @@ error: the range pattern here has ambiguous interpretation
   --> $DIR/half-open-range-pats-ref-ambiguous-interp.rs:10:10
    |
 LL |         &0..= | _ => {}
-   |          ^^^^ help: add parentheses to clarify the precedence: `(0 ..=)`
+   |          ^^^^ help: add parentheses to clarify the precedence: `(0..=)`
 
 error[E0586]: inclusive range with no end
   --> $DIR/half-open-range-pats-ref-ambiguous-interp.rs:13:11
diff --git a/src/test/ui/macros/stringify.rs b/src/test/ui/macros/stringify.rs
@@ -712,10 +712,10 @@ fn test_pat() {
 
     // PatKind::Range
     assert_eq!(stringify_pat!(..1), "..1");
-    assert_eq!(stringify_pat!(0..), "0 .."); // FIXME
-    assert_eq!(stringify_pat!(0..1), "0 ..1");
-    assert_eq!(stringify_pat!(0..=1), "0 ..=1");
-    assert_eq!(stringify_pat!(-2..=-1), "-2 ..=-1");
+    assert_eq!(stringify_pat!(0..), "0..");
+    assert_eq!(stringify_pat!(0..1), "0..1");
+    assert_eq!(stringify_pat!(0..=1), "0..=1");
+    assert_eq!(stringify_pat!(-2..=-1), "-2..=-1");
 
     // PatKind::Slice
     assert_eq!(stringify_pat!([]), "[]");
diff --git a/src/test/ui/parser/intersection-patterns.rs b/src/test/ui/parser/intersection-patterns.rs
@@ -34,7 +34,7 @@ fn main() {
         //~| pattern on the left, should be on the right
         //~| binding on the right, should be on the left
         //~| HELP switch the order
-        //~| SUGGESTION e @ 1 ..=5
+        //~| SUGGESTION e @ 1..=5
         _ => {}
     }
 }
diff --git a/src/test/ui/parser/intersection-patterns.stderr b/src/test/ui/parser/intersection-patterns.stderr
@@ -27,7 +27,7 @@ LL |         1 ..= 5 @ e => {}
    |         |         |
    |         |         binding on the right, should be on the left
    |         pattern on the left, should be on the right
-   |         help: switch the order: `e @ 1 ..=5`
+   |         help: switch the order: `e @ 1..=5`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.fixed b/src/test/ui/range/range-inclusive-pattern-precedence.fixed
@@ -12,7 +12,7 @@ pub fn main() {
         //~^ WARN `...` range patterns are deprecated
         //~| WARN this is accepted in the current edition
         //~| HELP use `..=` for an inclusive range
-        &(10 ..=15) => {}
+        &(10..=15) => {}
         //~^ ERROR the range pattern here has ambiguous interpretation
         //~| HELP add parentheses to clarify the precedence
         &(16..=20) => {}
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.stderr b/src/test/ui/range/range-inclusive-pattern-precedence.stderr
@@ -2,7 +2,7 @@ error: the range pattern here has ambiguous interpretation
   --> $DIR/range-inclusive-pattern-precedence.rs:15:10
    |
 LL |         &10..=15 => {}
-   |          ^^^^^^^ help: add parentheses to clarify the precedence: `(10 ..=15)`
+   |          ^^^^^^^ help: add parentheses to clarify the precedence: `(10..=15)`
 
 warning: `...` range patterns are deprecated
   --> $DIR/range-inclusive-pattern-precedence.rs:11:9
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence2.stderr b/src/test/ui/range/range-inclusive-pattern-precedence2.stderr
@@ -2,7 +2,7 @@ error: the range pattern here has ambiguous interpretation
   --> $DIR/range-inclusive-pattern-precedence2.rs:14:13
    |
 LL |         box 10..=15 => {}
-   |             ^^^^^^^ help: add parentheses to clarify the precedence: `(10 ..=15)`
+   |             ^^^^^^^ help: add parentheses to clarify the precedence: `(10..=15)`
 
 warning: `...` range patterns are deprecated
   --> $DIR/range-inclusive-pattern-precedence2.rs:10:14
diff --git a/src/test/ui/unpretty-expr-fn-arg.stdout b/src/test/ui/unpretty-expr-fn-arg.stdout
@@ -14,4 +14,4 @@ extern crate std;
 
 fn main() ({ } as ())
 
-fn foo((-(128 as i8) as i8) ...(127 as i8): i8) ({ } as ())
+fn foo((-(128 as i8) as i8)...(127 as i8): i8) ({ } as ())

Original file line number	Diff line number	Diff line change
`@@ -2515,7 +2515,6 @@ impl<'a> State<'a> {`
`2515`	`2515`	`PatKind::Range(ref begin, ref end, Spanned { node: ref end_kind, .. }) => {`
`2516`	`2516`	`if let Some(e) = begin {`
`2517`	`2517`	`self.print_expr(e);`
`2518`		`- self.space();`
`2519`	`2518`	`}`
`2520`	`2519`	`match *end_kind {`
`2521`	`2520`	`RangeEnd::Included(RangeSyntax::DotDotDot) => self.word("..."),`
Original file line number	Diff line number	Diff line change
`@@ -1948,7 +1948,6 @@ impl<'a> State<'a> {`
`1948`	`1948`	`PatKind::Range(ref begin, ref end, ref end_kind) => {`
`1949`	`1949`	`if let Some(expr) = begin {`
`1950`	`1950`	`self.print_expr(expr);`
`1951`		`- self.space();`
`1952`	`1951`	`}`
`1953`	`1952`	`match *end_kind {`
`1954`	`1953`	`RangeEnd::Included => self.word("..."),`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ fn main() {`
`34`	`34`	`//~\| pattern on the left, should be on the right`
`35`	`35`	`//~\| binding on the right, should be on the left`
`36`	`36`	`//~\| HELP switch the order`
`37`		`- //~\| SUGGESTION e @ 1 ..=5`
	`37`	`+ //~\| SUGGESTION e @ 1..=5`
`38`	`38`	`_ => {}`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: the range pattern here has ambiguous interpretation`
`2`	`2`	`--> $DIR/range-inclusive-pattern-precedence.rs:15:10`
`3`	`3`	`\|`
`4`	`4`	`LL \| &10..=15 => {}`
`5`		- \| ^^^^^^^ help: add parentheses to clarify the precedence: `(10 ..=15)`
	`5`	+ \| ^^^^^^^ help: add parentheses to clarify the precedence: `(10..=15)`
`6`	`6`
`7`	`7`	warning: `...` range patterns are deprecated
`8`	`8`	`--> $DIR/range-inclusive-pattern-precedence.rs:11:9`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: the range pattern here has ambiguous interpretation`
`2`	`2`	`--> $DIR/range-inclusive-pattern-precedence2.rs:14:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| box 10..=15 => {}`
`5`		- \| ^^^^^^^ help: add parentheses to clarify the precedence: `(10 ..=15)`
	`5`	+ \| ^^^^^^^ help: add parentheses to clarify the precedence: `(10..=15)`
`6`	`6`
`7`	`7`	warning: `...` range patterns are deprecated
`8`	`8`	`--> $DIR/range-inclusive-pattern-precedence2.rs:10:14`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ extern crate std;`
`14`	`14`
`15`	`15`	`fn main() ({ } as ())`
`16`	`16`
`17`		`-fn foo((-(128 as i8) as i8) ...(127 as i8): i8) ({ } as ())`
	`17`	`+fn foo((-(128 as i8) as i8)...(127 as i8): i8) ({ } as ())`