Don't put spaces inside tuples in error messages

This commit is contained in:
Richard Feldman 2023-08-13 21:48:23 -04:00
parent 7781080289
commit 7404842f49
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B

View file

@ -4115,21 +4115,21 @@ mod report_text {
alloc.text("()") alloc.text("()")
} else { } else {
alloc alloc
.text("( ") .text("(")
.append(alloc.ellipsis().append(alloc.text(" }"))) .append(alloc.ellipsis().append(alloc.text(")")))
} }
.append(ext_doc) .append(ext_doc)
} else if entries.len() == 1 { } else if entries.len() == 1 {
// Single-field records get printed on one line; multi-field records get multiple lines // Single-field records get printed on one line; multi-field records get multiple lines
alloc alloc
.text("( ") .text("(")
.append(entries.into_iter().next().unwrap()) .append(entries.into_iter().next().unwrap())
.append(if fields_omitted == 0 { .append(if fields_omitted == 0 {
alloc.text("") alloc.text("")
} else { } else {
alloc.text(", ").append(alloc.ellipsis()) alloc.text(", ").append(alloc.ellipsis())
}) })
.append(alloc.text(" )")) .append(alloc.text(")"))
.append(ext_doc) .append(ext_doc)
} else { } else {
let ending = if fields_omitted == 0 { let ending = if fields_omitted == 0 {
@ -4142,7 +4142,7 @@ mod report_text {
} }
.append(ext_doc); .append(ext_doc);
// Multi-elem tuple get printed on multiple lines // Multi-elem tuples get printed on multiple lines
alloc.vcat( alloc.vcat(
std::iter::once(alloc.reflow("(")).chain( std::iter::once(alloc.reflow("(")).chain(
entries entries