Remove MacDelimiter.

nnethercote · nnethercote · commit 14101ed5a5f9 · 2023-08-03T09:03:30.000+10:00
It's the same as `Delimiter`, minus the `Invisible` variant. I'm
generally in favour of using types to make impossible states
unrepresentable, but this one feels very low-value, and the conversions
between the two types are annoying and confusing.

Look at the change in `src/tools/rustfmt/src/expr.rs` for an example:
the old code converted from `MacDelimiter` to `Delimiter` and back
again, for no good reason. This suggests the author was confused about
the types.
diff --git a/src/expr.rs b/src/expr.rs
@@ -1382,12 +1382,8 @@ pub(crate) fn can_be_overflowed_expr(
                 || (context.use_block_indent() && args_len == 1)
         }
         ast::ExprKind::MacCall(ref mac) => {
-            match (
-                rustc_ast::ast::MacDelimiter::from_token(mac.args.delim.to_token()),
-                context.config.overflow_delimited_expr(),
-            ) {
-                (Some(ast::MacDelimiter::Bracket), true)
-                | (Some(ast::MacDelimiter::Brace), true) => true,
+            match (mac.args.delim, context.config.overflow_delimited_expr()) {
+                (Delimiter::Bracket, true) | (Delimiter::Brace, true) => true,
                 _ => context.use_block_indent() && args_len == 1,
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1382,12 +1382,8 @@ pub(crate) fn can_be_overflowed_expr(`
`1382`	`1382`	`\|\| (context.use_block_indent() && args_len == 1)`
`1383`	`1383`	`}`
`1384`	`1384`	`ast::ExprKind::MacCall(ref mac) => {`
`1385`		`- match (`
`1386`		`- rustc_ast::ast::MacDelimiter::from_token(mac.args.delim.to_token()),`
`1387`		`- context.config.overflow_delimited_expr(),`
`1388`		`- ) {`
`1389`		`- (Some(ast::MacDelimiter::Bracket), true)`
`1390`		`- \| (Some(ast::MacDelimiter::Brace), true) => true,`
	`1385`	`+ match (mac.args.delim, context.config.overflow_delimited_expr()) {`
	`1386`	`+ (Delimiter::Bracket, true) \| (Delimiter::Brace, true) => true,`
`1391`	`1387`	`_ => context.use_block_indent() && args_len == 1,`
`1392`	`1388`	`}`
`1393`	`1389`	`}`