diff options
| author | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
| commit | 86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7 (patch) | |
| tree | c3752892cdc43bf31324ebea11371fa503981bd4 /src/libstd/sys/unix/args.rs | |
| parent | 8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e (diff) | |
| parent | 8321b3fbe44b1edc9b6d012daeaf46ae2b6bc3c8 (diff) | |
| download | rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.tar.gz rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.zip | |
Auto merge of #74395 - Mark-Simulacrum:stage0-next, r=pietroalbini
Bump version to 1.47 This also bumps to a more recent rustfmt version, just to keep us relatively up to date (though almost nothing has changed in rustfmt we use beyond bumps to the parser infra). No formatting changes as a result of this. r? @pietroalbini
Diffstat (limited to 'src/libstd/sys/unix/args.rs')
| -rw-r--r-- | src/libstd/sys/unix/args.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/args.rs b/src/libstd/sys/unix/args.rs index 5b712e20242..9bc44a59482 100644 --- a/src/libstd/sys/unix/args.rs +++ b/src/libstd/sys/unix/args.rs @@ -208,7 +208,7 @@ mod imp { #[cfg(target_arch = "aarch64")] extern "C" { fn objc_msgSend(obj: NsId, sel: Sel) -> NsId; - #[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] + #[allow(clashing_extern_declarations)] #[link_name = "objc_msgSend"] fn objc_msgSend_ul(obj: NsId, sel: Sel, i: libc::c_ulong) -> NsId; } @@ -216,7 +216,7 @@ mod imp { #[cfg(not(target_arch = "aarch64"))] extern "C" { fn objc_msgSend(obj: NsId, sel: Sel, ...) -> NsId; - #[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] + #[allow(clashing_extern_declarations)] #[link_name = "objc_msgSend"] fn objc_msgSend_ul(obj: NsId, sel: Sel, ...) -> NsId; } |