aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2020-07-08 18:51:29 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2020-07-08 18:51:29 +0200
commitc4699d66bc340f5ee779a624eac4ded7bbe79cc7 (patch)
treed9bc7a37d08699220012d72c22059f2f8f2ed70a
parent4faa9e7d41eccb3ec29e79d5f960f9ab3c96a16a (diff)
downloadnihav-c4699d66bc340f5ee779a624eac4ded7bbe79cc7.tar.gz
Revert "core/formats: implement ToString instead of Display for NAChannelType"
This reverts commit 81b94329a275bb92066404bd3bb2822c5bb3f424. I forgot that implemented Display means automatic ToString() and not vice versa.
-rw-r--r--nihav-core/src/formats.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/nihav-core/src/formats.rs b/nihav-core/src/formats.rs
index 6d7f1a1..f96eb53 100644
--- a/nihav-core/src/formats.rs
+++ b/nihav-core/src/formats.rs
@@ -216,9 +216,9 @@ impl FromStr for NAChannelType {
}
}
-impl ToString for NAChannelType {
- fn to_string(&self) -> String {
- match *self {
+impl fmt::Display for NAChannelType {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ let name = match *self {
NAChannelType::C => "C".to_string(),
NAChannelType::L => "L".to_string(),
NAChannelType::R => "R".to_string(),
@@ -247,7 +247,8 @@ impl ToString for NAChannelType {
NAChannelType::Rt => "Rt".to_string(),
NAChannelType::Lo => "Lo".to_string(),
NAChannelType::Ro => "Ro".to_string(),
- }
+ };
+ write!(f, "{}", name)
}
}