diff options
| author | bors <bors@rust-lang.org> | 2019-06-13 12:52:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-13 12:52:29 +0000 |
| commit | 57a3300c2538fd1044ce45d9ef3b82182acb57ae (patch) | |
| tree | 3fa262efda57b73d9e6143b9e6ee569fecccd9c4 /src/libstd/sys_common | |
| parent | 96636f3eb8206f7499451ebc5b347d000d7aee08 (diff) | |
| parent | 8917b8e32ca5928b83afc8da03746acb4914a53a (diff) | |
Auto merge of #61799 - Centril:rollup-vpm5uxr, r=Centril
Rollup of 5 pull requests Successful merges: - #61598 (Handle index out of bound errors during const eval without panic) - #61720 (std: Remove internal definitions of `cfg_if!` macro) - #61757 (Deprecate ONCE_INIT in future 1.38 release) - #61766 (submodules: update clippy from c0dbd34b to bd33a97c) - #61791 (Small cleanup in `check_pat_path`) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index c4daedefd8e..13a59f66c5c 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.rs @@ -65,7 +65,7 @@ pub mod bytestring; pub mod process; pub mod fs; -cfg_if! { +cfg_if::cfg_if! { if #[cfg(any(target_os = "cloudabi", target_os = "l4re", target_os = "redox", |