about summary refs log tree commit diff
path: root/library/std/src/sys/hermit/os.rs
diff options
context:
space:
mode:
authorAris Merchant <22333129+inquisitivecrystal@users.noreply.github.com>2021-06-24 16:04:24 -0700
committerAris Merchant <22333129+inquisitivecrystal@users.noreply.github.com>2021-07-05 22:19:23 -0700
commita12107afaaa634cd7352d3828caef89a975299bb (patch)
tree0a36d26e1d64f16ceab64e9a926bdc22d371c619 /library/std/src/sys/hermit/os.rs
parentd26e01e9df416304f7d0cc425bd0290560e12fae (diff)
downloadrust-a12107afaaa634cd7352d3828caef89a975299bb.tar.gz
rust-a12107afaaa634cd7352d3828caef89a975299bb.zip
Make `getenv` return an Option instead of a Result
Diffstat (limited to 'library/std/src/sys/hermit/os.rs')
-rw-r--r--library/std/src/sys/hermit/os.rs9
1 files changed, 2 insertions, 7 deletions
diff --git a/library/std/src/sys/hermit/os.rs b/library/std/src/sys/hermit/os.rs
index eeb30a578c0..8f927df85be 100644
--- a/library/std/src/sys/hermit/os.rs
+++ b/library/std/src/sys/hermit/os.rs
@@ -140,13 +140,8 @@ pub fn env() -> Env {
     }
 }
 
-pub fn getenv(k: &OsStr) -> io::Result<Option<OsString>> {
-    unsafe {
-        match ENV.as_ref().unwrap().lock().unwrap().get_mut(k) {
-            Some(value) => Ok(Some(value.clone())),
-            None => Ok(None),
-        }
-    }
+pub fn getenv(k: &OsStr) -> Option<OsString> {
+    unsafe { ENV.as_ref().unwrap().lock().unwrap().get_mut(k).cloned() }
 }
 
 pub fn setenv(k: &OsStr, v: &OsStr) -> io::Result<()> {