diff options
| author | jumbatm <30644300+jumbatm@users.noreply.github.com> | 2020-06-28 10:11:04 +1000 |
|---|---|---|
| committer | jumbatm <30644300+jumbatm@users.noreply.github.com> | 2020-06-28 10:11:29 +1000 |
| commit | c72a5dd9d37eb2f0d2aab3f4eb9d9a1a41986836 (patch) | |
| tree | 90d08947ec4634b24542bb40f983c7fe77337ff9 /src/libcore | |
| parent | 394e1b40d264aa6928811919c1124fa248e7d802 (diff) | |
| download | rust-c72a5dd9d37eb2f0d2aab3f4eb9d9a1a41986836.tar.gz rust-c72a5dd9d37eb2f0d2aab3f4eb9d9a1a41986836.zip | |
Rename the lint to clashing_extern_declarations.
Also, run RustFmt on the clashing_extern_fn test case and update stderrs.
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; |