diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-06-28 08:30:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-28 08:30:33 -0700 |
| commit | 8b92eecbc2ea2644c4dbe9965f8360bc0dc45b33 (patch) | |
| tree | 1f8cb9c475696b18cbc8f276cec425594d1b437d /src/libstd/sys | |
| parent | dd811399271d9812d73d11c656c58947adfafa57 (diff) | |
| parent | c72a5dd9d37eb2f0d2aab3f4eb9d9a1a41986836 (diff) | |
| download | rust-8b92eecbc2ea2644c4dbe9965f8360bc0dc45b33.tar.gz rust-8b92eecbc2ea2644c4dbe9965f8360bc0dc45b33.zip | |
Rollup merge of #73817 - jumbatm:rename-to-clashing-extern-declarations, r=petrochenkov
Rename clashing_extern_decl to clashing_extern_declarations. Rename clashing_extern_decl to clashing_extern_declarations to bring in-line with lint naming conventions. Fixes #73802. r? @petrochenkov
Diffstat (limited to 'src/libstd/sys')
| -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 1d1cdda1257..773fab36be2 100644 --- a/src/libstd/sys/unix/args.rs +++ b/src/libstd/sys/unix/args.rs @@ -205,7 +205,7 @@ mod imp { #[cfg(target_arch = "aarch64")] extern "C" { fn objc_msgSend(obj: NsId, sel: Sel) -> NsId; - #[cfg_attr(not(bootstrap), allow(clashing_extern_decl))] + #[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] #[link_name = "objc_msgSend"] fn objc_msgSend_ul(obj: NsId, sel: Sel, i: libc::c_ulong) -> NsId; } @@ -213,7 +213,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_decl))] + #[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] #[link_name = "objc_msgSend"] fn objc_msgSend_ul(obj: NsId, sel: Sel, ...) -> NsId; } |