diff options
| author | bors <bors@rust-lang.org> | 2015-07-17 10:26:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-17 10:26:31 +0000 |
| commit | b5dad7dcb22ed6bf8ebaae56b4339bd64f6983eb (patch) | |
| tree | c6264e5f99eea0c99ac7d99c32446e7347160bfd /src/libstd | |
| parent | 8e9bd6cd26a8f9d11188e39c52aafb4436b09990 (diff) | |
| parent | ed8b7ea83e4c10c9a4bd3390b5f24af23a9146dd (diff) | |
| download | rust-b5dad7dcb22ed6bf8ebaae56b4339bd64f6983eb.tar.gz rust-b5dad7dcb22ed6bf8ebaae56b4339bd64f6983eb.zip | |
Auto merge of #27082 - Manishearth:rollup, r=Manishearth
- Successful merges: #25993, #27038, #27069, #27070, #27080 - Failed merges: #27034, #27064
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/ext/raw.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index b65e065fe91..6842de56d21 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -11,7 +11,7 @@ //! Inspection and manipulation of the process's environment. //! //! This module contains methods to inspect various aspects such as -//! environment varibles, process arguments, the current directory, and various +//! environment variables, process arguments, the current directory, and various //! other important directories. #![stable(feature = "env", since = "1.0.0")] diff --git a/src/libstd/sys/windows/ext/raw.rs b/src/libstd/sys/windows/ext/raw.rs index e1796d4b5f0..92d53e2e428 100644 --- a/src/libstd/sys/windows/ext/raw.rs +++ b/src/libstd/sys/windows/ext/raw.rs @@ -10,7 +10,7 @@ //! Windows-specific primitives -#[stable(feature = "raw_ext", since = "1.1.0")] +#![stable(feature = "raw_ext", since = "1.1.0")] use os::raw::c_void; |