squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

cleanup: remove static lifetimes from consts in libstd

Browse source
This commit is contained in:
ljedrz 2018-12-04 10:21:42 +01:00
parent 91d5d56c00
commit 8c4129cd9a
16 changed files with 173 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/libstd/env.rs
View file

@ -828,7 +828,7 @@ pub mod consts {
/// - s390x /// - s390x
/// - sparc64 /// - sparc64
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const ARCH: &'static str = super::arch::ARCH; pub const ARCH: &str = super::arch::ARCH;
/// The family of the operating system. Example value is `unix`. /// The family of the operating system. Example value is `unix`.
/// ///
@ -837,7 +837,7 @@ pub mod consts {
/// - unix /// - unix
/// - windows /// - windows
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const FAMILY: &'static str = os::FAMILY; pub const FAMILY: &str = os::FAMILY;
/// A string describing the specific operating system in use. /// A string describing the specific operating system in use.
/// Example value is `linux`. /// Example value is `linux`.
@ -856,7 +856,7 @@ pub mod consts {
/// - android /// - android
/// - windows /// - windows
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const OS: &'static str = os::OS; pub const OS: &str = os::OS;
/// Specifies the filename prefix used for shared libraries on this /// Specifies the filename prefix used for shared libraries on this
/// platform. Example value is `lib`. /// platform. Example value is `lib`.
@ -866,7 +866,7 @@ pub mod consts {
/// - lib /// - lib
/// - `""` (an empty string) /// - `""` (an empty string)
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const DLL_PREFIX: &'static str = os::DLL_PREFIX; pub const DLL_PREFIX: &str = os::DLL_PREFIX;
/// Specifies the filename suffix used for shared libraries on this /// Specifies the filename suffix used for shared libraries on this
/// platform. Example value is `.so`. /// platform. Example value is `.so`.
@ -877,7 +877,7 @@ pub mod consts {
/// - .dylib /// - .dylib
/// - .dll /// - .dll
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const DLL_SUFFIX: &'static str = os::DLL_SUFFIX; pub const DLL_SUFFIX: &str = os::DLL_SUFFIX;
/// Specifies the file extension used for shared libraries on this /// Specifies the file extension used for shared libraries on this
/// platform that goes after the dot. Example value is `so`. /// platform that goes after the dot. Example value is `so`.
@ -888,7 +888,7 @@ pub mod consts {
/// - dylib /// - dylib
/// - dll /// - dll
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const DLL_EXTENSION: &'static str = os::DLL_EXTENSION; pub const DLL_EXTENSION: &str = os::DLL_EXTENSION;
/// Specifies the filename suffix used for executable binaries on this /// Specifies the filename suffix used for executable binaries on this
/// platform. Example value is `.exe`. /// platform. Example value is `.exe`.
@ -900,7 +900,7 @@ pub mod consts {
/// - .pexe /// - .pexe
/// - `""` (an empty string) /// - `""` (an empty string)
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const EXE_SUFFIX: &'static str = os::EXE_SUFFIX; pub const EXE_SUFFIX: &str = os::EXE_SUFFIX;
/// Specifies the file extension, if any, used for executable binaries /// Specifies the file extension, if any, used for executable binaries
/// on this platform. Example value is `exe`. /// on this platform. Example value is `exe`.
@ -910,72 +910,72 @@ pub mod consts {
/// - exe /// - exe
/// - `""` (an empty string) /// - `""` (an empty string)
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub const EXE_EXTENSION: &'static str = os::EXE_EXTENSION; pub const EXE_EXTENSION: &str = os::EXE_EXTENSION;
} }
#[cfg(target_arch = "x86")] #[cfg(target_arch = "x86")]
mod arch { mod arch {
pub const ARCH: &'static str = "x86"; pub const ARCH: &str = "x86";
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
mod arch { mod arch {
pub const ARCH: &'static str = "x86_64"; pub const ARCH: &str = "x86_64";
} }
#[cfg(target_arch = "arm")] #[cfg(target_arch = "arm")]
mod arch { mod arch {
pub const ARCH: &'static str = "arm"; pub const ARCH: &str = "arm";
} }
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
mod arch { mod arch {
pub const ARCH: &'static str = "aarch64"; pub const ARCH: &str = "aarch64";
} }
#[cfg(target_arch = "mips")] #[cfg(target_arch = "mips")]
mod arch { mod arch {
pub const ARCH: &'static str = "mips"; pub const ARCH: &str = "mips";
} }
#[cfg(target_arch = "mips64")] #[cfg(target_arch = "mips64")]
mod arch { mod arch {
pub const ARCH: &'static str = "mips64"; pub const ARCH: &str = "mips64";
} }
#[cfg(target_arch = "powerpc")] #[cfg(target_arch = "powerpc")]
mod arch { mod arch {
pub const ARCH: &'static str = "powerpc"; pub const ARCH: &str = "powerpc";
} }
#[cfg(target_arch = "powerpc64")] #[cfg(target_arch = "powerpc64")]
mod arch { mod arch {
pub const ARCH: &'static str = "powerpc64"; pub const ARCH: &str = "powerpc64";
} }
#[cfg(target_arch = "s390x")] #[cfg(target_arch = "s390x")]
mod arch { mod arch {
pub const ARCH: &'static str = "s390x"; pub const ARCH: &str = "s390x";
} }
#[cfg(target_arch = "sparc64")] #[cfg(target_arch = "sparc64")]
mod arch { mod arch {
pub const ARCH: &'static str = "sparc64"; pub const ARCH: &str = "sparc64";
} }
#[cfg(target_arch = "le32")] #[cfg(target_arch = "le32")]
mod arch { mod arch {
pub const ARCH: &'static str = "le32"; pub const ARCH: &str = "le32";
} }
#[cfg(target_arch = "asmjs")] #[cfg(target_arch = "asmjs")]
mod arch { mod arch {
pub const ARCH: &'static str = "asmjs"; pub const ARCH: &str = "asmjs";
} }
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
mod arch { mod arch {
pub const ARCH: &'static str = "wasm32"; pub const ARCH: &str = "wasm32";
} }
#[cfg(test)] #[cfg(test)]

4
src/libstd/ffi/c_str.rs
View file

@ -671,7 +671,7 @@ impl fmt::Debug for CStr {
#[stable(feature = "cstr_default", since = "1.10.0")] #[stable(feature = "cstr_default", since = "1.10.0")]
impl<'a> Default for &'a CStr { impl<'a> Default for &'a CStr {
fn default() -> &'a CStr { fn default() -> &'a CStr {
const SLICE: &'static [c_char] = &[0]; const SLICE: &[c_char] = &[0];
unsafe { CStr::from_ptr(SLICE.as_ptr()) } unsafe { CStr::from_ptr(SLICE.as_ptr()) }
} }
} }
@ -1475,7 +1475,7 @@ mod tests {
#[test] #[test]
fn cstr_const_constructor() { fn cstr_const_constructor() {
const CSTR: &'static CStr = unsafe { const CSTR: &CStr = unsafe {
CStr::from_bytes_with_nul_unchecked(b"Hello, world!\0") CStr::from_bytes_with_nul_unchecked(b"Hello, world!\0")
}; };

2
src/libstd/keyword_docs.rs
View file

@ -65,7 +65,7 @@ mod as_keyword { }
/// look like this: /// look like this:
/// ///
/// ```rust /// ```rust
/// const WORDS: &'static str = "hello rust!"; /// const WORDS: &str = "hello rust!";
/// ``` /// ```
/// ///
/// Thanks to static lifetime elision, you usually don't have to explicitly use 'static: /// Thanks to static lifetime elision, you usually don't have to explicitly use 'static:

14
src/libstd/sys/cloudabi/shims/env.rs
View file

@ -9,11 +9,11 @@
// except according to those terms. // except according to those terms.
pub mod os { pub mod os {
pub const FAMILY: &'static str = "cloudabi"; pub const FAMILY: &str = "cloudabi";
pub const OS: &'static str = "cloudabi"; pub const OS: &str = "cloudabi";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }

14
src/libstd/sys/redox/env.rs
View file

@ -9,11 +9,11 @@
// except according to those terms. // except according to those terms.
pub mod os { pub mod os {
pub const FAMILY: &'static str = "redox"; pub const FAMILY: &str = "redox";
pub const OS: &'static str = "redox"; pub const OS: &str = "redox";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }

2
src/libstd/sys/redox/path.rs
View file

@ -35,5 +35,5 @@ pub fn parse_prefix(path: &OsStr) -> Option<Prefix> {
} }
} }
pub const MAIN_SEP_STR: &'static str = "/"; pub const MAIN_SEP_STR: &str = "/";
pub const MAIN_SEP: char = '/'; pub const MAIN_SEP: char = '/';

2
src/libstd/sys/redox/process.rs
View file

@ -143,7 +143,7 @@ impl Command {
pub fn spawn(&mut self, default: Stdio, needs_stdin: bool) pub fn spawn(&mut self, default: Stdio, needs_stdin: bool)
-> io::Result<(Process, StdioPipes)> { -> io::Result<(Process, StdioPipes)> {
const CLOEXEC_MSG_FOOTER: &'static [u8] = b"NOEX"; const CLOEXEC_MSG_FOOTER: &[u8] = b"NOEX";
if self.saw_nul { if self.saw_nul {
return Err(io::Error::new(ErrorKind::InvalidInput, return Err(io::Error::new(ErrorKind::InvalidInput,

224
src/libstd/sys/unix/env.rs
View file

@ -10,176 +10,176 @@
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "linux"; pub const OS: &str = "linux";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "macos"; pub const OS: &str = "macos";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".dylib"; pub const DLL_SUFFIX: &str = ".dylib";
pub const DLL_EXTENSION: &'static str = "dylib"; pub const DLL_EXTENSION: &str = "dylib";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "ios")] #[cfg(target_os = "ios")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "ios"; pub const OS: &str = "ios";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".dylib"; pub const DLL_SUFFIX: &str = ".dylib";
pub const DLL_EXTENSION: &'static str = "dylib"; pub const DLL_EXTENSION: &str = "dylib";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "freebsd")] #[cfg(target_os = "freebsd")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "freebsd"; pub const OS: &str = "freebsd";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "dragonfly")] #[cfg(target_os = "dragonfly")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "dragonfly"; pub const OS: &str = "dragonfly";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "bitrig")] #[cfg(target_os = "bitrig")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "bitrig"; pub const OS: &str = "bitrig";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "netbsd")] #[cfg(target_os = "netbsd")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "netbsd"; pub const OS: &str = "netbsd";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "openbsd")] #[cfg(target_os = "openbsd")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "openbsd"; pub const OS: &str = "openbsd";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "android"; pub const OS: &str = "android";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "solaris")] #[cfg(target_os = "solaris")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "solaris"; pub const OS: &str = "solaris";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "haiku")] #[cfg(target_os = "haiku")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "haiku"; pub const OS: &str = "haiku";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(all(target_os = "emscripten", target_arch = "asmjs"))] #[cfg(all(target_os = "emscripten", target_arch = "asmjs"))]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "emscripten"; pub const OS: &str = "emscripten";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ".js"; pub const EXE_SUFFIX: &str = ".js";
pub const EXE_EXTENSION: &'static str = "js"; pub const EXE_EXTENSION: &str = "js";
} }
#[cfg(all(target_os = "emscripten", target_arch = "wasm32"))] #[cfg(all(target_os = "emscripten", target_arch = "wasm32"))]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "emscripten"; pub const OS: &str = "emscripten";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ".js"; pub const EXE_SUFFIX: &str = ".js";
pub const EXE_EXTENSION: &'static str = "js"; pub const EXE_EXTENSION: &str = "js";
} }
#[cfg(target_os = "fuchsia")] #[cfg(target_os = "fuchsia")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "fuchsia"; pub const OS: &str = "fuchsia";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "l4re")] #[cfg(target_os = "l4re")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "l4re"; pub const OS: &str = "l4re";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }
#[cfg(target_os = "hermit")] #[cfg(target_os = "hermit")]
pub mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &str = "unix";
pub const OS: &'static str = "hermit"; pub const OS: &str = "hermit";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &'static str = ".so"; pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &'static str = "so"; pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &'static str = ""; pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &'static str = ""; pub const EXE_EXTENSION: &str = "";
} }

2
src/libstd/sys/unix/path.rs
View file

@ -25,5 +25,5 @@ pub fn parse_prefix(_: &OsStr) -> Option<Prefix> {
None None
} }
pub const MAIN_SEP_STR: &'static str = "/"; pub const MAIN_SEP_STR: &str = "/";
pub const MAIN_SEP: char = '/'; pub const MAIN_SEP: char = '/';

2
src/libstd/sys/unix/process/process_unix.rs
View file

@ -22,7 +22,7 @@ use sys;
impl Command { impl Command {
pub fn spawn(&mut self, default: Stdio, needs_stdin: bool) pub fn spawn(&mut self, default: Stdio, needs_stdin: bool)
-> io::Result<(Process, StdioPipes)> { -> io::Result<(Process, StdioPipes)> {
const CLOEXEC_MSG_FOOTER: &'static [u8] = b"NOEX"; const CLOEXEC_MSG_FOOTER: &[u8] = b"NOEX";
let envp = self.capture_env(); let envp = self.capture_env();

14
src/libstd/sys/wasm/env.rs
View file

@ -9,11 +9,11 @@
// except according to those terms. // except according to those terms.
pub mod os { pub mod os {
pub const FAMILY: &'static str = ""; pub const FAMILY: &str = "";
pub const OS: &'static str = ""; pub const OS: &str = "";
pub const DLL_PREFIX: &'static str = ""; pub const DLL_PREFIX: &str = "";
pub const DLL_SUFFIX: &'static str = ".wasm"; pub const DLL_SUFFIX: &str = ".wasm";
pub const DLL_EXTENSION: &'static str = "wasm"; pub const DLL_EXTENSION: &str = "wasm";
pub const EXE_SUFFIX: &'static str = ".wasm"; pub const EXE_SUFFIX: &str = ".wasm";
pub const EXE_EXTENSION: &'static str = "wasm"; pub const EXE_EXTENSION: &str = "wasm";
} }

2
src/libstd/sys/wasm/path.rs
View file

@ -25,5 +25,5 @@ pub fn parse_prefix(_: &OsStr) -> Option<Prefix> {
None None
} }
pub const MAIN_SEP_STR: &'static str = "/"; pub const MAIN_SEP_STR: &str = "/";
pub const MAIN_SEP: char = '/'; pub const MAIN_SEP: char = '/';

14
src/libstd/sys/windows/env.rs
View file

@ -9,11 +9,11 @@
// except according to those terms. // except according to those terms.
pub mod os { pub mod os {
pub const FAMILY: &'static str = "windows"; pub const FAMILY: &str = "windows";
pub const OS: &'static str = "windows"; pub const OS: &str = "windows";
pub const DLL_PREFIX: &'static str = ""; pub const DLL_PREFIX: &str = "";
pub const DLL_SUFFIX: &'static str = ".dll"; pub const DLL_SUFFIX: &str = ".dll";
pub const DLL_EXTENSION: &'static str = "dll"; pub const DLL_EXTENSION: &str = "dll";
pub const EXE_SUFFIX: &'static str = ".exe"; pub const EXE_SUFFIX: &str = ".exe";
pub const EXE_EXTENSION: &'static str = "exe"; pub const EXE_EXTENSION: &str = "exe";
} }

4
src/libstd/sys/windows/os.rs
View file

@ -48,8 +48,8 @@ pub fn error_string(mut errnum: i32) -> String {
// `[MS-ERREF]`: https://msdn.microsoft.com/en-us/library/cc231198.aspx // `[MS-ERREF]`: https://msdn.microsoft.com/en-us/library/cc231198.aspx
if (errnum & c::FACILITY_NT_BIT as i32) != 0 { if (errnum & c::FACILITY_NT_BIT as i32) != 0 {
// format according to https://support.microsoft.com/en-us/help/259693 // format according to https://support.microsoft.com/en-us/help/259693
const NTDLL_DLL: &'static [u16] = &['N' as _, 'T' as _, 'D' as _, 'L' as _, 'L' as _, const NTDLL_DLL: &[u16] = &['N' as _, 'T' as _, 'D' as _, 'L' as _, 'L' as _,
'.' as _, 'D' as _, 'L' as _, 'L' as _, 0]; '.' as _, 'D' as _, 'L' as _, 'L' as _, 0];
module = c::GetModuleHandleW(NTDLL_DLL.as_ptr()); module = c::GetModuleHandleW(NTDLL_DLL.as_ptr());
if module != ptr::null_mut() { if module != ptr::null_mut() {

2
src/libstd/sys/windows/path.rs
View file

@ -102,5 +102,5 @@ pub fn parse_prefix<'a>(path: &'a OsStr) -> Option<Prefix> {
} }
} }
pub const MAIN_SEP_STR: &'static str = "\\"; pub const MAIN_SEP_STR: &str = "\\";
pub const MAIN_SEP: char = '\\'; pub const MAIN_SEP: char = '\\';

2
src/libstd/sys_common/wtf8.rs
View file

@ -40,7 +40,7 @@ use str;
use sync::Arc; use sync::Arc;
use sys_common::AsInner; use sys_common::AsInner;
const UTF8_REPLACEMENT_CHARACTER: &'static str = "\u{FFFD}"; const UTF8_REPLACEMENT_CHARACTER: &str = "\u{FFFD}";
/// A Unicode code point: from U+0000 to U+10FFFF. /// A Unicode code point: from U+0000 to U+10FFFF.
/// ///