bors 80deabd098 Auto merge of #120227 - nnethercote:further-improve-space_between, r=petrochenkov ...

Further improve `space_between`

`space_between` is used by `print_tts` to decide when spaces should be put between  tokens. This PR improves it in two ways:
- avoid unnecessary spaces before semicolons, and
- don't omit some necessary spaces before/after some punctuation symbols.

r? `@petrochenkov`

2024-01-31 02:01:43 +00:00

..

auxiliary

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

debug

…

outer

…

pretty-print-hack

…

add-impl.rs

…

allowed-attr-stmt-expr.rs

…

allowed-attr-stmt-expr.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

allowed-signatures.rs

…

ambiguous-builtin-attrs-test.rs

…

ambiguous-builtin-attrs-test.stderr

…

ambiguous-builtin-attrs.rs

…

ambiguous-builtin-attrs.stderr

…

amputate-span.fixed

…

amputate-span.rs

…

amputate-span.stderr

…

append-impl.rs

…

attr-args.rs

…

attr-cfg.rs

…

attr-complex-fn.rs

…

attr-complex-fn.stdout

…

attr-invalid-exprs.rs

…

attr-invalid-exprs.stderr

…

attr-on-trait.rs

…

attr-stmt-expr-rpass.rs

…

attr-stmt-expr.rs

…

attr-stmt-expr.stderr

…

attr-stmt-expr.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

attribute-after-derive.rs

…

attribute-after-derive.stdout

…

attribute-spans-preserved.rs

…

attribute-spans-preserved.stderr

…

attribute-spans-preserved.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

attribute-with-error.rs

…

attribute-with-error.stderr

…

attribute.rs

…

attribute.stderr

…

attributes-included.rs

…

attributes-included.stderr

…

attributes-on-definitions.rs

…

attributes-on-definitions.stderr

…

attributes-on-modules-fail.rs

…

attributes-on-modules-fail.stderr

…

attributes-on-modules.rs

…

bad-projection.rs

…

bad-projection.stderr

…

bang-macro.rs

…

break-token-spans.rs

…

break-token-spans.stderr

…

call-deprecated.rs

…

call-deprecated.stderr

…

call-site.rs

…

capture-macro-rules-invoke.rs

…

capture-macro-rules-invoke.stdout

…

capture-unglued-token.rs

…

capture-unglued-token.stdout

…

cfg-eval-fail.rs

…

cfg-eval-fail.stderr

…

cfg-eval-inner.rs

…

cfg-eval-inner.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

cfg-eval.rs

…

cfg-eval.stdout

…

count_compound_ops.rs

…

crate-attrs-multiple.rs

…

crate-var.rs

…

crt-static.rs

…

custom-attr-only-one-derive.rs

…

define-two.rs

…

define-two.stderr

…

derive-attr-cfg.rs

…

derive-b.rs

…

derive-bad.rs

…

derive-bad.stderr

…

derive-expand-order.rs

…

derive-expand-order.stdout

…

derive-helper-configured.rs

…

derive-helper-legacy-limits.rs

…

derive-helper-legacy-limits.stderr

…

derive-helper-legacy-spurious.rs

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29 17:43:07 +08:00

derive-helper-legacy-spurious.stderr

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29 17:43:07 +08:00

derive-helper-shadowed.rs

…

derive-helper-shadowing-2.rs

…

derive-helper-shadowing.rs

…

derive-helper-shadowing.stderr

…

derive-helper-vs-legacy.rs

…

derive-in-mod.rs

…

derive-multiple-with-packed.rs

…

derive-same-struct.rs

…

derive-same-struct.stdout

…

derive-still-gated.rs

…

derive-still-gated.stderr

…

derive-test.rs

…

derive-two-attrs.rs

…

derive-union.rs

…

disappearing-resolution.rs

…

disappearing-resolution.stderr

…

doc-comment-preserved.rs

…

doc-comment-preserved.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

dollar-crate-issue-57089.rs

…

dollar-crate-issue-57089.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

dollar-crate-issue-62325.rs

…

dollar-crate-issue-62325.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

dollar-crate-issue-101211.rs

…

dollar-crate.rs

…

dollar-crate.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

edition-gated-async-move-syntax-issue89699.rs

…

edition-gated-async-move-syntax-issue89699.stderr

…

edition-imports-2018.rs

…

empty-crate.rs

…

empty-where-clause.rs

…

empty-where-clause.stderr

…

env.rs

…

expand-expr.rs

…

expand-expr.stderr

…

expand-to-derive.rs

…

expand-to-derive.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

expand-to-unstable.rs

…

expand-to-unstable.stderr

…

expand-with-a-macro.rs

…

export-macro.rs

…

export-macro.stderr

…

exports.rs

…

exports.stderr

…

expr-stmt-nonterminal-tokens.rs

…

expr-stmt-nonterminal-tokens.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

extern-prelude-extern-crate-proc-macro.rs

…

gen-lifetime-token.rs

…

gen-macro-rules-hygiene.rs

…

gen-macro-rules-hygiene.stderr

…

gen-macro-rules.rs

…

generate-dollar-ident.rs

…

generate-mod.rs

…

generate-mod.stderr

…

helper-attr-blocked-by-import-ambig.rs

…

helper-attr-blocked-by-import-ambig.stderr

…

helper-attr-blocked-by-import.rs

…

hygiene_example.rs

…

illegal-proc-macro-derive-use.rs

…

illegal-proc-macro-derive-use.stderr

…

import.rs

…

import.stderr

…

inert-attribute-order.rs

…

inert-attribute-order.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

inner-attr-non-inline-mod.rs

…

inner-attr-non-inline-mod.stderr

…

inner-attr-non-inline-mod.stdout

…

inner-attrs.rs

…

inner-attrs.stderr

…

inner-attrs.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

input-interpolated.rs

…

input-interpolated.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

invalid-attributes.rs

…

invalid-attributes.stderr

…

invalid-punct-ident-1.rs

…

invalid-punct-ident-1.stderr

…

invalid-punct-ident-2.rs

…

invalid-punct-ident-2.stderr

…

invalid-punct-ident-3.rs

…

invalid-punct-ident-3.stderr

…

invalid-punct-ident-4.rs

…

invalid-punct-ident-4.stderr

…

is-available.rs

…

issue-36935.rs

…

issue-36935.stderr

…

issue-37788.rs

…

issue-37788.stderr

…

issue-38586.rs

…

issue-38586.stderr

…

issue-39889.rs

…

issue-42708.rs

…

issue-50061.rs

…

issue-50493.rs

…

issue-50493.stderr

…

issue-53481.rs

…

issue-59191-replace-root-with-fn.rs

…

issue-59191-replace-root-with-fn.stderr

…

issue-66286.rs

…

issue-66286.stderr

…

issue-73933-procedural-masquerade.rs

…

issue-73933-procedural-masquerade.stdout

…

issue-75734-pp-paren.rs

…

issue-75734-pp-paren.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

issue-75801.rs

…

issue-75801.stderr

…

issue-75930-derive-cfg.rs

…

issue-75930-derive-cfg.stderr

…

issue-75930-derive-cfg.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

issue-76182-leading-vert-pat.rs

…

issue-76182-leading-vert-pat.stdout

Fix some cases in space_between.

2024-01-22 20:19:17 +11:00

issue-76270-panic-in-libproc-macro.rs

…

issue-76270-panic-in-libproc-macro.stderr

…

issue-78675-captured-inner-attrs.rs

…

issue-78675-captured-inner-attrs.stdout

…

issue-79148.rs

…

issue-79148.stderr

…

issue-79242-slow-retokenize-check.rs

…

issue-79825.rs

…

issue-80760-empty-stmt.rs

…

issue-80760-empty-stmt.stdout

…

issue-81007-item-attrs.rs

…

issue-81007-item-attrs.stdout

…

issue-81543-item-parse-err.rs

…

issue-81543-item-parse-err.stderr

…

issue-81555.rs

…

issue-83469-global-alloc-invalid-stmt.rs

…

issue-83469-global-alloc-invalid-stmt.stderr

…

issue-83510.rs

…

issue-83510.stderr

…

issue-86781-bad-inner-doc.fixed

…

issue-86781-bad-inner-doc.rs

…

issue-86781-bad-inner-doc.stderr

…

issue-89566-suggest-fix-invalid-top-level-macro-attr.fixed

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29 17:43:07 +08:00

issue-89566-suggest-fix-invalid-top-level-macro-attr.rs

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29 17:43:07 +08:00

issue-89566-suggest-fix-invalid-top-level-macro-attr.stderr

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29 17:43:07 +08:00

issue-91800.rs

…

issue-91800.stderr

…

issue-104884-trait-impl-sugg-err.rs

…

issue-104884-trait-impl-sugg-err.stderr

…

issue-107113-wrap.rs

…

issue-107113-wrap.stderr

…

issue-118455-skip-err-builtin.rs

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29 17:43:07 +08:00

issue-118455-skip-err-builtin.stderr

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29 17:43:07 +08:00

item-error.rs

…

item-error.stderr

…

keep-expr-tokens.rs

…

keep-expr-tokens.stderr

…

keep-expr-tokens.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

lifetimes-rpass.rs

…

lifetimes.rs

…

lifetimes.stderr

…

lints_in_proc_macros.rs

…

lints_in_proc_macros.stderr

…

literal-to-string.rs

…

literal-to-string.stdout

…

load-panic-backtrace.rs

…

load-panic-backtrace.stderr

…

load-panic.rs

…

load-panic.stderr

…

load-two.rs

…

macro-brackets.rs

…

macro-brackets.stderr

…

macro-crate-multi-decorator.rs

…

macro-namespace-reserved-2.rs

…

macro-namespace-reserved-2.stderr

…

macro-namespace-reserved.rs

…

macro-namespace-reserved.stderr

…

macro-quote-cond.rs

…

macro-rules-derive-cfg.rs

…

macro-rules-derive-cfg.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

macro-rules-derive.rs

…

macro-rules-derive.stderr

…

macro-use-attr.rs

…

macro-use-bang.rs

…

macros-in-extern-derive.rs

…

macros-in-extern-derive.stderr

…

macros-in-extern.rs

…

macros-in-type.rs

…

meta-delim.rs

…

meta-macro-hygiene.rs

…

meta-macro-hygiene.stdout

…

meta-macro.rs

…

meta-macro.stdout

…

mixed-site-span.rs

…

mixed-site-span.stderr

…

modify-ast.rs

…

module_with_attrs.rs

…

module.rs

…

multispan.rs

…

multispan.stderr

…

negative-token.rs

…

nested-derive-cfg.rs

…

nested-derive-cfg.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

nested-item-spans.rs

…

nested-item-spans.stderr

…

nested-macro-rules.rs

…

nested-macro-rules.stdout

…

nested-nonterminal-tokens.rs

…

nested-nonterminal-tokens.stdout

…

no-macro-use-attr.rs

…

no-macro-use-attr.stderr

…

no-mangle-in-proc-macro-issue-111888.rs

…

no-missing-docs.rs

…

nodelim-groups.rs

…

nodelim-groups.stdout

…

non-root.rs

…

non-root.stderr

…

nonterminal-expansion.rs

…

nonterminal-expansion.stdout

…

nonterminal-recollect-attr.rs

…

nonterminal-recollect-attr.stdout

…

nonterminal-token-hygiene.rs

…

nonterminal-token-hygiene.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

not-joint.rs

…

out-of-line-mod.rs

…

panic-abort.rs

…

panic-abort.stderr

…

parent-source-spans.rs

…

parent-source-spans.stderr

…

pretty-print-hack-hide.rs

…

pretty-print-hack-hide.stdout

…

pretty-print-hack-show.local.stderr

…

pretty-print-hack-show.local.stdout

…

pretty-print-hack-show.remapped.stderr

…

pretty-print-hack-show.remapped.stdout

…

pretty-print-hack-show.rs

…

pretty-print-tts.rs

…

pretty-print-tts.stdout

Don't insert spaces before most semicolons in print_tts.

2024-01-22 20:14:59 +11:00

proc-macro-abi.rs

…

proc-macro-abi.stderr

…

proc-macro-attributes.rs

…

proc-macro-attributes.stderr

…

proc-macro-deprecated-attr.rs

…

proc-macro-gates2.rs

…

proc-macro-gates2.stderr

…

proc-macro-gates.rs

…

proc-macro-gates.stderr

…

pub-at-crate-root.rs

…

pub-at-crate-root.stderr

…

quote-debug.rs

…

quote-debug.stdout

…

raw-ident.rs

…

raw-ident.stderr

…

reserved-macro-names.rs

…

reserved-macro-names.stderr

…

resolve-error.rs

…

resolve-error.stderr

…

resolved-located-at.rs

…

resolved-located-at.stderr

…

shadow.rs

…

shadow.stderr

…

signature-proc-macro-attribute.rs

…

signature-proc-macro-attribute.stderr

…

signature-proc-macro-derive.rs

…

signature-proc-macro-derive.stderr

…

signature-proc-macro.rs

…

signature-proc-macro.stderr

…

signature.rs

…

signature.stderr

…

smoke.rs

…

span-absolute-posititions.rs

…

span-absolute-posititions.stderr

…

span-api-tests.rs

…

span-from-proc-macro.rs

…

span-from-proc-macro.stderr

…

span-preservation.rs

…

span-preservation.stderr

…

struct-field-macro.rs

…

subspan.rs

…

subspan.stderr

…

test-same-crate.rs

…

test-same-crate.stderr

…

test.rs

…

three-equals.rs

…

three-equals.stderr

…

trailing-plus.rs

…

trailing-plus.stdout

…

trait-fn-args-2015.rs

…

two-crate-types-1.rs

…

two-crate-types-1.stderr

…

two-crate-types-2.rs

…

two-crate-types-2.stderr

…

unsafe-foreign-mod.rs

…

unsafe-mod.rs

…

visibility-path.rs

…

visibility-path.stderr

…

weird-braces.rs

…

weird-braces.stdout

…

weird-hygiene.rs

…

weird-hygiene.stderr

…