diff options
| author | bors <bors@rust-lang.org> | 2018-12-05 23:00:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-05 23:00:36 +0000 |
| commit | 4988b096e673204b91683dc693fc3eb6b2323e97 (patch) | |
| tree | c63388f353229ae491e3d9b2bc04758e70a90b04 /src/libstd/sys/cloudabi | |
| parent | 14997d56a550f4aa99fe737593cd2758227afc56 (diff) | |
| parent | f8ee5ab8035ffab91a5b57e2f0d4822e4e7a64b9 (diff) | |
| download | rust-4988b096e673204b91683dc693fc3eb6b2323e97.tar.gz rust-4988b096e673204b91683dc693fc3eb6b2323e97.zip | |
Auto merge of #56549 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests Successful merges: - #51753 (Document `From` implementations) - #55563 (Improve no result found sentence in doc search) - #55987 (Add Weak.ptr_eq) - #56119 (Utilize `?` instead of `return None`.) - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs) - #56388 (More MIR borrow check cleanup) - #56424 (Mention raw-ident syntax) - #56452 (Remove redundant clones) - #56456 (Handle existential types in dead code analysis) - #56466 (data_structures: remove tuple_slice) - #56476 (Fix invalid line number match) - #56497 (cleanup: remove static lifetimes from consts in libstd) - #56498 (Fix line numbers display) - #56523 (Added a bare-bones eslint config (removing jslint)) - #56538 (Use inner iterator may_have_side_effect for Cloned) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys/cloudabi')
| -rw-r--r-- | src/libstd/sys/cloudabi/shims/env.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/sys/cloudabi/shims/env.rs b/src/libstd/sys/cloudabi/shims/env.rs index 31777aa94bc..c7691e3b2df 100644 --- a/src/libstd/sys/cloudabi/shims/env.rs +++ b/src/libstd/sys/cloudabi/shims/env.rs @@ -9,11 +9,11 @@ // except according to those terms. pub mod os { - pub const FAMILY: &'static str = "cloudabi"; - pub const OS: &'static str = "cloudabi"; - pub const DLL_PREFIX: &'static str = "lib"; - pub const DLL_SUFFIX: &'static str = ".so"; - pub const DLL_EXTENSION: &'static str = "so"; - pub const EXE_SUFFIX: &'static str = ""; - pub const EXE_EXTENSION: &'static str = ""; + pub const FAMILY: &str = "cloudabi"; + pub const OS: &str = "cloudabi"; + pub const DLL_PREFIX: &str = "lib"; + pub const DLL_SUFFIX: &str = ".so"; + pub const DLL_EXTENSION: &str = "so"; + pub const EXE_SUFFIX: &str = ""; + pub const EXE_EXTENSION: &str = ""; } |
