get rid of default-env crate

Author: Mic92

Cargo.lock

@@ -13,7 +13,7 @@ name = "tests"
 [dependencies]
 cfg-match = "0.2.1"
 constcat = "0.6.1"
-default-env = "0.1.1"
+
 embedded-io = "0.6.1"
 goblin = { version = "0.9.3", default-features = false, features = [
     "elf32",

Cargo.toml

@@ -24,15 +24,17 @@ use arch::{
     NIX_LD_SYSTEM_ENV_BYTES,
 };
 use args::{Args, EnvEdit, VarHandle};
-use default_env::default_env;
 use support::StackSpace;
 
 static mut ARGS: MaybeUninit<Args> = MaybeUninit::uninit();
 static mut STACK: MaybeUninit<StackSpace> = MaybeUninit::uninit();
 
 const DEFAULT_NIX_LD: &CStr = unsafe {
     CStr::from_bytes_with_nul_unchecked(concat_slices!([u8]:
-        default_env!("DEFAULT_NIX_LD", "/run/current-system/sw/share/nix-ld/lib/ld.so").as_bytes(),
+        match option_env!("DEFAULT_NIX_LD") {
+            Some(path) => path,
+            None => "/run/current-system/sw/share/nix-ld/lib/ld.so",
+        }.as_bytes(),
         b"\0"
     ))
 };
@@ -133,7 +135,7 @@ extern "C" fn real_main() -> ! {
             DEFAULT_NIX_LD_LIBRARY_PATH
         };
 
-        let sep: &[u8] = if head.is_empty() || *head.last().unwrap() == b':' {
+        let sep: &[u8] = if head.is_empty() || head.last() == Some(&b':') {
             &[]
         } else {
             b":"