Include Rust 1.25.0 compatible implementations.

Issue rust-lang#135
azriel91 · Dec 12, 2018 · 03147a5 · 03147a5
1 parent 1ff8f06
commit 03147a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/symbolize/dbghelp.rs b/src/symbolize/dbghelp.rs
@@ -10,8 +10,12 @@
 
 #![allow(bad_style)]
 
+#[cfg(feature = "std")]
+use std::char;
+
 use core::mem;
 use core::slice;
+#[cfg(not(feature = "std"))]
 use core::char;
 
 use winapi::ctypes::*;

diff --git a/src/types.rs b/src/types.rs
@@ -31,8 +31,8 @@ impl<'a> BytesOrWideString<'a> {
         use self::BytesOrWideString::*;
 
         match self {
-            Bytes(slice) => String::from_utf8_lossy(slice),
-            Wide(wide) => Cow::Owned(String::from_utf16_lossy(wide)),
+            &Bytes(slice) => String::from_utf8_lossy(slice),
+            &Wide(wide) => Cow::Owned(String::from_utf16_lossy(wide)),
         }
     }