From 978cc936491d23bd38ef18aa98ddcc7472ef5f54 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 22 Oct 2020 19:19:05 +0200 Subject: Fix typo --- crates/cfg/src/dnf.rs | 1 + crates/cfg/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'crates') diff --git a/crates/cfg/src/dnf.rs b/crates/cfg/src/dnf.rs index 35f946e6f..a08c307da 100644 --- a/crates/cfg/src/dnf.rs +++ b/crates/cfg/src/dnf.rs @@ -458,6 +458,7 @@ mod test { &opts, expect![["test and test2 are enabled"]], ); + check_why_inactive("#![cfg(all(a, b))]", &opts, expect![["a and b are disabled"]]); check_why_inactive( "#![cfg(all(not(test), a))]", &opts, diff --git a/crates/cfg/src/lib.rs b/crates/cfg/src/lib.rs index 0b0734213..28a40a082 100644 --- a/crates/cfg/src/lib.rs +++ b/crates/cfg/src/lib.rs @@ -137,7 +137,7 @@ impl fmt::Display for InactiveReason { for (i, atom) in self.disabled.iter().enumerate() { let sep = match i { 0 => "", - _ if i == self.enabled.len() - 1 => " and ", + _ if i == self.disabled.len() - 1 => " and ", _ => ", ", }; f.write_str(sep)?; -- cgit v1.2.3