Fix compilation regression for 1.34

colored-rs · Feb 24, 2020 · 24ba05b · 24ba05b
1 parent 7e75fda
commit 24ba05b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+# 1.9.3 (February 24, 2020)
+- Fix compilation regression for 1.34.0. Thanks @jlevon for reporting.
+
 # 1.9.2 (January 11, 2020)
 - Exposed `ColoredString` data through methods for purposes of interrogating the applied colours.
 - Increased documentation.

diff --git a/src/lib.rs b/src/lib.rs
@@ -308,7 +308,7 @@ impl ColoredString {
     /// assert_eq!(cstr.fgcolor(), None);
     /// ```
     pub fn fgcolor(&self) -> Option<Color> {
-        self.fgcolor.as_ref().copied()
+        self.fgcolor.as_ref().map(|x| *x)
     }
 
     /// Get the current background color applied.
@@ -321,7 +321,7 @@ impl ColoredString {
     /// assert_eq!(cstr.bgcolor(), None);
     /// ```
     pub fn bgcolor(&self) -> Option<Color> {
-        self.bgcolor.as_ref().copied()
+        self.bgcolor.as_ref().map(|x| *x)
     }
 
     /// Get the current [`Style`] which can be check if it contains a [`Styles`].