diff options
| author | bors <bors@rust-lang.org> | 2015-12-02 02:43:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-02 02:43:04 +0000 |
| commit | cede907e91cb5aba641cf12d4f956ec994a5196f (patch) | |
| tree | c454b60d8a109bea38394231259ab3e660abbd3b /src/libstd | |
| parent | 2f95de3b3b99954f48f189bcca195eb43c67844e (diff) | |
| parent | 9823511b2a2d052c47af7cc4795d26b17a8baf06 (diff) | |
| download | rust-cede907e91cb5aba641cf12d4f956ec994a5196f.tar.gz rust-cede907e91cb5aba641cf12d4f956ec994a5196f.zip | |
Auto merge of #30155 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #30129, #30134, #30136, #30144, #30150, #30153, #30154 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index a63c90c4a91..760733872ea 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -671,9 +671,9 @@ pub mod consts { /// /// Some possible values: /// - /// - .so - /// - .dylib - /// - .dll + /// - so + /// - dylib + /// - dll #[stable(feature = "env", since = "1.0.0")] pub const DLL_EXTENSION: &'static str = super::os::DLL_EXTENSION; @@ -682,7 +682,9 @@ pub mod consts { /// /// Some possible values: /// - /// - exe + /// - .exe + /// - .nexe + /// - .pexe /// - `""` (an empty string) #[stable(feature = "env", since = "1.0.0")] pub const EXE_SUFFIX: &'static str = super::os::EXE_SUFFIX; |