user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #73817 - jumbatm:rename-to-clashing-extern-declarations, r=petrochenkov

Browse source 
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
This commit is contained in:
Manish Goregaokar 2020-06-28 08:30:33 -07:00 • committed by GitHub
commit 8b92eecbc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 91 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/issues/issue-1866.rs
View file

@ -1,7 +1,7 @@
// build-pass
#![allow(dead_code)]
#![allow(non_camel_case_types)]
#![warn(clashing_extern_decl)]
#![warn(clashing_extern_declarations)]
// pretty-expanded FIXME #23616

4
src/test/ui/issues/issue-1866.stderr
View file

@ -10,8 +10,8 @@ LL | pub fn rust_task_is_unwinding(rt: *const rust_task) -> bool;
note: the lint level is defined here
--> $DIR/issue-1866.rs:4:9
|
LL | #![warn(clashing_extern_decl)]
| ^^^^^^^^^^^^^^^^^^^^
LL | #![warn(clashing_extern_declarations)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: expected `unsafe extern "C" fn(*const usize) -> bool`
found `unsafe extern "C" fn(*const bool) -> bool`

2
src/test/ui/issues/issue-5791.rs
View file

@ -1,6 +1,6 @@
// run-pass
#![allow(dead_code)]
#![warn(clashing_extern_decl)]
#![warn(clashing_extern_declarations)]
// pretty-expanded FIXME #23616
extern {

4
src/test/ui/issues/issue-5791.stderr
View file

@ -12,8 +12,8 @@ LL | | fn malloc2(len: i32, foo: i32) -> *const u8;
note: the lint level is defined here
--> $DIR/issue-5791.rs:3:9
|
LL | #![warn(clashing_extern_decl)]
| ^^^^^^^^^^^^^^^^^^^^
LL | #![warn(clashing_extern_declarations)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: expected `unsafe extern "C" fn(i32) -> *const u8`
found `unsafe extern "C" fn(i32, i32) -> *const u8`