Skip to content

Commit 54b85a1

Browse files
authored
strip whitespace if version set empty (#164)
1 parent 7a4945f commit 54b85a1

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/requirement.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,27 @@ pub(crate) struct DisplayRequirement<'i, I: Interner> {
8181
impl<I: Interner> Display for DisplayRequirement<'_, I> {
8282
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
8383
match *self.requirement {
84-
Requirement::Single(version_set) => write!(
85-
f,
86-
"{} {}",
87-
self.interner
88-
.display_name(self.interner.version_set_name(version_set)),
89-
self.interner.display_version_set(version_set)
90-
),
84+
Requirement::Single(version_set) => {
85+
let result = format!(
86+
"{} {}",
87+
self.interner
88+
.display_name(self.interner.version_set_name(version_set)),
89+
self.interner.display_version_set(version_set)
90+
);
91+
write!(f, "{}", result.trim_end())
92+
}
9193
Requirement::Union(version_set_union) => {
9294
let formatted_version_sets = self
9395
.interner
9496
.version_sets_in_union(version_set_union)
9597
.format_with(" | ", |version_set, f| {
96-
f(&format_args!(
98+
let result = format!(
9799
"{} {}",
98100
self.interner
99101
.display_name(self.interner.version_set_name(version_set)),
100102
self.interner.display_version_set(version_set)
101-
))
103+
);
104+
f(&format_args!("{}", result.trim_end()))
102105
});
103106

104107
write!(f, "{}", formatted_version_sets)

0 commit comments

Comments
 (0)