diff options
| author | bors <bors@rust-lang.org> | 2018-08-09 19:05:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-09 19:05:14 +0000 |
| commit | 8958ed672298148841b3b8d6371ce301e1cbbac1 (patch) | |
| tree | 7f51966483dbc2f13ef51cb6c244f11c8a31dd52 /src/libstd | |
| parent | b73535f1e9c46a698527fab51b1cc9fad3f53412 (diff) | |
| parent | 9f55705a24fa3a9f3977f1f95bc37143b2d857a0 (diff) | |
| download | rust-8958ed672298148841b3b8d6371ce301e1cbbac1.tar.gz rust-8958ed672298148841b3b8d6371ce301e1cbbac1.zip | |
Auto merge of #53216 - kennytm:rollup, r=kennytm
Rollup of 15 pull requests
Successful merges:
- #52773 (Avoid unnecessary pattern matching against Option and Result)
- #53082 (Fix doc link (again))
- #53094 (Automatically expand section if url id point to one of its component)
- #53106 (atomic ordering docs)
- #53110 (Account for --remap-path-prefix in save-analysis)
- #53116 (NetBSD: fix signedess of char)
- #53179 (Whitelist wasm32 simd128 target feature)
- #53183 (Suggest comma when missing in macro call)
- #53207 (Add individual docs for rotate_{left, right})
- #53211 ([nll] enable feature(nll) on various crates for bootstrap)
- #53214 ([nll] enable feature(nll) on various crates for bootstrap: part 2)
- #53215 (Slightly refactor syntax_ext/format)
- #53217 (inline some short functions)
- #53219 ([nll] enable feature(nll) on various crates for bootstrap: part 3)
- #53222 (A few cleanups for rustc_target)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os/raw/mod.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/os/raw/mod.rs b/src/libstd/os/raw/mod.rs index d5eeb5252f0..4b8dda493b0 100644 --- a/src/libstd/os/raw/mod.rs +++ b/src/libstd/os/raw/mod.rs @@ -29,6 +29,8 @@ use fmt; all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), all(target_os = "l4re", target_arch = "x86_64"), + all(target_os = "netbsd", any(target_arch = "arm", + target_arch = "powerpc")), all(target_os = "openbsd", target_arch = "aarch64"), all(target_os = "fuchsia", target_arch = "aarch64")))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; @@ -41,6 +43,8 @@ use fmt; all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), all(target_os = "l4re", target_arch = "x86_64"), + all(target_os = "netbsd", any(target_arch = "arm", + target_arch = "powerpc")), all(target_os = "openbsd", target_arch = "aarch64"), all(target_os = "fuchsia", target_arch = "aarch64"))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8; |