From 729442206cda26e1a6d03f545a872389b2139606 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 30 Nov 2016 21:50:17 -0700 Subject: [PATCH] Cleanup env --- src/libstd/sys/redox/os.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libstd/sys/redox/os.rs b/src/libstd/sys/redox/os.rs index 15fb0cf21114..135e972bca40 100644 --- a/src/libstd/sys/redox/os.rs +++ b/src/libstd/sys/redox/os.rs @@ -144,10 +144,11 @@ pub fn env() -> Env { let mut string = String::new(); if file.read_to_string(&mut string).is_ok() { for line in string.lines() { - if let Some(equal_sign) = line.chars().position(|c| c == '=') { - let name = line.chars().take(equal_sign).collect::(); - let value = line.chars().skip(equal_sign+1).collect::(); - variables.push((OsString::from(name), OsString::from(value))); + let mut parts = line.splitn(2, '='); + if let Some(name) = parts.next() { + let value = parts.next().unwrap_or(""); + variables.push((OsString::from(name.to_string()), + OsString::from(value.to_string()))); } } }