diff options
| author | bors <bors@rust-lang.org> | 2022-03-03 04:28:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-03 04:28:08 +0000 |
| commit | 2f8d1a835b4e7feaf625f74d0d5cb9b84dbc845a (patch) | |
| tree | 58c9e240fbbb366d99880f74d49ab390c79285fb /library/core/src | |
| parent | 8769f4ef2fe1efddd1f072485f97f568e7328f79 (diff) | |
| parent | 878a4ff90e5987027f8ce3d350faaad02e0c83c9 (diff) | |
| download | rust-2f8d1a835b4e7feaf625f74d0d5cb9b84dbc845a.tar.gz rust-2f8d1a835b4e7feaf625f74d0d5cb9b84dbc845a.zip | |
Auto merge of #94541 - Dylan-DPC:rollup-564wbq3, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #92061 (update char signess for openbsd) - #93072 (Compatible variants suggestion with desugaring) - #93354 (Add documentation about `BorrowedFd::to_owned`.) - #93663 (Rename `BorrowedFd::borrow_raw_fd` to `BorrowedFd::borrow_raw`.) - #94375 (Adt copy suggestions) - #94433 (Improve allowness of the unexpected_cfgs lint) - #94499 (Documentation was missed when demoting Windows XP to no_std only) - #94505 (Restore the local filter on mono item sorting) - #94529 (Unused doc comments blocks) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src')
| -rw-r--r-- | library/core/src/ffi/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/library/core/src/ffi/mod.rs b/library/core/src/ffi/mod.rs index e5255686ff9..2b611e5aae2 100644 --- a/library/core/src/ffi/mod.rs +++ b/library/core/src/ffi/mod.rs @@ -117,7 +117,7 @@ mod c_char_definition { all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), all(target_os = "l4re", target_arch = "x86_64"), all( - target_os = "freebsd", + any(target_os = "freebsd", target_os = "openbsd"), any( target_arch = "aarch64", target_arch = "arm", @@ -130,7 +130,6 @@ mod c_char_definition { target_os = "netbsd", any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc") ), - all(target_os = "openbsd", target_arch = "aarch64"), all( target_os = "vxworks", any( |