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/libcore | |
| 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/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 2b26e5303a8..15466ce94a8 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -279,9 +279,9 @@ pub mod primitive; // crate uses the this crate as its libcore. #[path = "../stdarch/crates/core_arch/src/mod.rs"] #[allow(missing_docs, missing_debug_implementations, dead_code, unused_imports)] -// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_decl is +// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is // merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet. -#[cfg_attr(not(bootstrap), allow(clashing_extern_decl))] +#[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] #[unstable(feature = "stdsimd", issue = "48556")] mod core_arch; |