Skip to content

Commit

Permalink
Rollup merge of rust-lang#79602 - jethrogb:sgx-fix-79038, r=Mark-Simu…
Browse files Browse the repository at this point in the history
…lacrum

Fix SGX CI

Broken in rust-lang#79038
  • Loading branch information
GuillaumeGomez authored Dec 1, 2020
2 parents 55c5127 + af7280b commit b6d9abe
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion library/std/tests/env.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::env::*;
use std::ffi::{OsStr, OsString};
use std::path::PathBuf;

use rand::distributions::Alphanumeric;
use rand::{thread_rng, Rng};
Expand Down Expand Up @@ -82,6 +81,8 @@ fn test_env_set_var() {
#[cfg_attr(any(target_os = "emscripten", target_env = "sgx"), ignore)]
#[allow(deprecated)]
fn env_home_dir() {
use std::path::PathBuf;

fn var_to_os_string(var: Result<String, VarError>) -> Option<OsString> {
match var {
Ok(var) => Some(OsString::from(var)),
Expand Down

0 comments on commit b6d9abe

Please sign in to comment.