diff options
| author | bors <bors@rust-lang.org> | 2015-08-05 02:00:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-05 02:00:46 +0000 |
| commit | dbe415a4a7c3e10eff6d9a4b08128c341742e401 (patch) | |
| tree | e1d3a1eac26b8adba127155b7c7d607dafe1908d /src/libstd/process.rs | |
| parent | efdbc0ec7e9bd8d2dadbe78b003fd7facf2a7aae (diff) | |
| parent | 0d8340327c03f319b49cb91e2e64aa66dd1e76c7 (diff) | |
| download | rust-dbe415a4a7c3e10eff6d9a4b08128c341742e401.tar.gz rust-dbe415a4a7c3e10eff6d9a4b08128c341742e401.zip | |
Auto merge of #27393 - alexcrichton:no-std-changes, r=brson
This commit is an implementation of [RFC 1184][rfc] which tweaks the behavior of the `#![no_std]` attribute and adds a new `#![no_core]` attribute. The `#![no_std]` attribute now injects `extern crate core` at the top of the crate as well as the libcore prelude into all modules (in the same manner as the standard library's prelude). The `#![no_core]` attribute disables both std and core injection. [rfc]: https://github.com/rust-lang/rfcs/pull/1184 Closes #27394
Diffstat (limited to 'src/libstd/process.rs')
| -rw-r--r-- | src/libstd/process.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 74a66558627..be921d9aef0 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -815,7 +815,7 @@ mod tests { #[cfg(target_os="android")] #[test] fn test_inherit_env() { - use std::env; + use env; let mut result = env_cmd().output().unwrap(); let output = String::from_utf8(result.stdout).unwrap(); |
