diff options
| author | varkor <github@varkor.com> | 2019-02-15 22:26:36 +0000 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2019-02-15 22:29:24 +0000 |
| commit | 9cfdb800859a5a5cea876e97232644325931f4fc (patch) | |
| tree | 8bf34d1d397d4e8d47fa455f1d8a1d591e1cc30b | |
| parent | 2279907fd268b6e800c8e586f247f806003e81f5 (diff) | |
| download | rust-9cfdb800859a5a5cea876e97232644325931f4fc.tar.gz rust-9cfdb800859a5a5cea876e97232644325931f4fc.zip | |
Update tests
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
| -rw-r--r-- | src/test/ui/generic/generic-no-mangle.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/generic/generic-no-mangle.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/lint/suggestions.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/lint/suggestions.stderr | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/test/ui/generic/generic-no-mangle.rs b/src/test/ui/generic/generic-no-mangle.rs index 15e662a41de..994aebc7f6e 100644 --- a/src/test/ui/generic/generic-no-mangle.rs +++ b/src/test/ui/generic/generic-no-mangle.rs @@ -1,10 +1,10 @@ #![deny(no_mangle_generic_items)] #[no_mangle] -pub fn foo<T>() {} //~ ERROR functions generic over types must be mangled +pub fn foo<T>() {} //~ ERROR functions generic over types or consts must be mangled #[no_mangle] -pub extern fn bar<T>() {} //~ ERROR functions generic over types must be mangled +pub extern fn bar<T>() {} //~ ERROR functions generic over types or consts must be mangled #[no_mangle] pub fn baz(x: &i32) -> &i32 { x } diff --git a/src/test/ui/generic/generic-no-mangle.stderr b/src/test/ui/generic/generic-no-mangle.stderr index 639ee199101..3da39f1dc17 100644 --- a/src/test/ui/generic/generic-no-mangle.stderr +++ b/src/test/ui/generic/generic-no-mangle.stderr @@ -1,9 +1,9 @@ -error: functions generic over types must be mangled +error: functions generic over types or consts must be mangled --> $DIR/generic-no-mangle.rs:4:1 | LL | #[no_mangle] | ------------ help: remove this attribute -LL | pub fn foo<T>() {} //~ ERROR functions generic over types must be mangled +LL | pub fn foo<T>() {} //~ ERROR functions generic over types or consts must be mangled | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here @@ -12,12 +12,12 @@ note: lint level defined here LL | #![deny(no_mangle_generic_items)] | ^^^^^^^^^^^^^^^^^^^^^^^ -error: functions generic over types must be mangled +error: functions generic over types or consts must be mangled --> $DIR/generic-no-mangle.rs:7:1 | LL | #[no_mangle] | ------------ help: remove this attribute -LL | pub extern fn bar<T>() {} //~ ERROR functions generic over types must be mangled +LL | pub extern fn bar<T>() {} //~ ERROR functions generic over types or consts must be mangled | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to 2 previous errors diff --git a/src/test/ui/lint/suggestions.rs b/src/test/ui/lint/suggestions.rs index a497953d73a..67bd6dd501b 100644 --- a/src/test/ui/lint/suggestions.rs +++ b/src/test/ui/lint/suggestions.rs @@ -10,7 +10,7 @@ #[no_mangle] //~^ HELP remove this attribute pub fn defiant<T>(_t: T) {} -//~^ WARN functions generic over types must be mangled +//~^ WARN functions generic over types or consts must be mangled #[no_mangle] fn rio_grande() {} @@ -23,7 +23,7 @@ mod badlands { //~^ ERROR const items should never be #[no_mangle] //~| HELP try a static value #[no_mangle] pub fn val_jean<T>() {} - //~^ WARN functions generic over types must be mangled + //~^ WARN functions generic over types or consts must be mangled //~| HELP remove this attribute // ... but we can suggest just-`pub` instead of restricted @@ -31,7 +31,7 @@ mod badlands { //~^ ERROR const items should never be #[no_mangle] //~| HELP try a static value #[no_mangle] pub(crate) fn crossfield<T>() {} - //~^ WARN functions generic over types must be mangled + //~^ WARN functions generic over types or consts must be mangled //~| HELP remove this attribute } diff --git a/src/test/ui/lint/suggestions.stderr b/src/test/ui/lint/suggestions.stderr index c70f17f95d0..1e4eabc9db0 100644 --- a/src/test/ui/lint/suggestions.stderr +++ b/src/test/ui/lint/suggestions.stderr @@ -54,7 +54,7 @@ LL | #[no_mangle] const DISCOVERY: usize = 1; | = note: #[deny(no_mangle_const_items)] on by default -warning: functions generic over types must be mangled +warning: functions generic over types or consts must be mangled --> $DIR/suggestions.rs:12:1 | LL | #[no_mangle] @@ -73,7 +73,7 @@ LL | #[no_mangle] pub const DAUNTLESS: bool = true; | | | help: try a static value: `pub static` -warning: functions generic over types must be mangled +warning: functions generic over types or consts must be mangled --> $DIR/suggestions.rs:25:18 | LL | #[no_mangle] pub fn val_jean<T>() {} @@ -89,7 +89,7 @@ LL | #[no_mangle] pub(crate) const VETAR: bool = true; | | | help: try a static value: `pub static` -warning: functions generic over types must be mangled +warning: functions generic over types or consts must be mangled --> $DIR/suggestions.rs:33:18 | LL | #[no_mangle] pub(crate) fn crossfield<T>() {} |
