Merge pull request #401 from sunriseos/dependabot/cargo/bstr-0.2.6

Bump bstr from 0.1.4 to 0.2.6
sunriseos · Aug 6, 2019 · 7a9498c · 7a9498c
2 parents a399996 + d22e61a
commit 7a9498c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wall-clock/Cargo.toml b/wall-clock/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2018"
 sunrise-libuser = { path = "../libuser" }
 log = "0.4.6"
 spin = "0.5"
-bstr = { version = "0.1", default-features = false }
+bstr = { version = "0.2", default-features = false }
diff --git a/wall-clock/src/main.rs b/wall-clock/src/main.rs
@@ -28,6 +28,7 @@ use sunrise_libuser::time::{RTCManagerProxy, StaticServiceProxy, TimeZoneRule, C
 use spin::Mutex;
 
 use bstr::BStr;
+use bstr::ByteSlice;
 
 /// Turns a day of week number from RTC into an english string.
 /// /// 
@@ -109,11 +110,11 @@ fn main() {
 
     // Get default timezone name
     let device_location = timezone_service.get_device_location_name().unwrap();
-    let device_location_trimed = BStr::from_bytes(&device_location).trim_with(|c| c == '\0');
+    let device_location_trimed = device_location.as_bstr().trim_with(|c| c == '\0').as_bstr();
 
     // Let's get New York time
     let custom_location = b"America/New_York\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-    let custom_location_trimed = BStr::from_bytes(&custom_location[..]).trim_with(|c| c == '\0');
+    let custom_location_trimed = custom_location.as_bstr().trim_with(|c| c == '\0').as_bstr();
 
     // Load a custom one
     let mut rule = TIMEZONE_RULE.lock();