Update error messages in codegen-units tests

Author: steffahn

src/test/codegen-units/item-collection/function-as-argument.rs

@@ -18,14 +18,14 @@ fn take_fn_pointer<T1, T2>(f: fn(T1, T2), x: T1, y: T2) {
 #[start]
 fn start(_: isize, _: *const *const u8) -> isize {
 
-    //~ MONO_ITEM fn take_fn_once::<u32, &str, fn(u32, &str) {function::<u32, &str>}>
+    //~ MONO_ITEM fn take_fn_once::<u32, &str, [fn item {function::<u32, &str>}: fn(u32, &str)]>
     //~ MONO_ITEM fn function::<u32, &str>
-    //~ MONO_ITEM fn <fn(u32, &str) {function::<u32, &str>} as std::ops::FnOnce<(u32, &str)>>::call_once - shim(fn(u32, &str) {function::<u32, &str>})
+    //~ MONO_ITEM fn <[fn item {function::<u32, &str>}: fn(u32, &str)] as std::ops::FnOnce<(u32, &str)>>::call_once - shim([fn item {function::<u32, &str>}: fn(u32, &str)])
     take_fn_once(function, 0u32, "abc");
 
-    //~ MONO_ITEM fn take_fn_once::<char, f64, fn(char, f64) {function::<char, f64>}>
+    //~ MONO_ITEM fn take_fn_once::<char, f64, [fn item {function::<char, f64>}: fn(char, f64)]>
     //~ MONO_ITEM fn function::<char, f64>
-    //~ MONO_ITEM fn <fn(char, f64) {function::<char, f64>} as std::ops::FnOnce<(char, f64)>>::call_once - shim(fn(char, f64) {function::<char, f64>})
+    //~ MONO_ITEM fn <[fn item {function::<char, f64>}: fn(char, f64)] as std::ops::FnOnce<(char, f64)>>::call_once - shim([fn item {function::<char, f64>}: fn(char, f64)])
     take_fn_once(function, 'c', 0f64);
 
     //~ MONO_ITEM fn take_fn_pointer::<i32, ()>

src/test/codegen-units/item-collection/trait-method-as-argument.rs

@@ -30,30 +30,30 @@ fn take_foo_mut<T, F: FnMut(T) -> T>(mut f: F, arg: T) -> T {
 //~ MONO_ITEM fn start
 #[start]
 fn start(_: isize, _: *const *const u8) -> isize {
-    //~ MONO_ITEM fn take_foo_once::<u32, fn(u32) -> u32 {<u32 as Trait>::foo}>
+    //~ MONO_ITEM fn take_foo_once::<u32, [fn item {<u32 as Trait>::foo}: fn(u32) -> u32]>
     //~ MONO_ITEM fn <u32 as Trait>::foo
-    //~ MONO_ITEM fn <fn(u32) -> u32 {<u32 as Trait>::foo} as std::ops::FnOnce<(u32,)>>::call_once - shim(fn(u32) -> u32 {<u32 as Trait>::foo})
+    //~ MONO_ITEM fn <[fn item {<u32 as Trait>::foo}: fn(u32) -> u32] as std::ops::FnOnce<(u32,)>>::call_once - shim([fn item {<u32 as Trait>::foo}: fn(u32) -> u32])
     take_foo_once(Trait::foo, 0u32);
 
-    //~ MONO_ITEM fn take_foo_once::<char, fn(char) -> char {<char as Trait>::foo}>
+    //~ MONO_ITEM fn take_foo_once::<char, [fn item {<char as Trait>::foo}: fn(char) -> char]>
     //~ MONO_ITEM fn <char as Trait>::foo
-    //~ MONO_ITEM fn <fn(char) -> char {<char as Trait>::foo} as std::ops::FnOnce<(char,)>>::call_once - shim(fn(char) -> char {<char as Trait>::foo})
+    //~ MONO_ITEM fn <[fn item {<char as Trait>::foo}: fn(char) -> char] as std::ops::FnOnce<(char,)>>::call_once - shim([fn item {<char as Trait>::foo}: fn(char) -> char])
     take_foo_once(Trait::foo, 'c');
 
-    //~ MONO_ITEM fn take_foo::<u32, fn(u32) -> u32 {<u32 as Trait>::foo}>
-    //~ MONO_ITEM fn <fn(u32) -> u32 {<u32 as Trait>::foo} as std::ops::Fn<(u32,)>>::call - shim(fn(u32) -> u32 {<u32 as Trait>::foo})
+    //~ MONO_ITEM fn take_foo::<u32, [fn item {<u32 as Trait>::foo}: fn(u32) -> u32]>
+    //~ MONO_ITEM fn <[fn item {<u32 as Trait>::foo}: fn(u32) -> u32] as std::ops::Fn<(u32,)>>::call - shim([fn item {<u32 as Trait>::foo}: fn(u32) -> u32])
     take_foo(Trait::foo, 0u32);
 
-    //~ MONO_ITEM fn take_foo::<char, fn(char) -> char {<char as Trait>::foo}>
-    //~ MONO_ITEM fn <fn(char) -> char {<char as Trait>::foo} as std::ops::Fn<(char,)>>::call - shim(fn(char) -> char {<char as Trait>::foo})
+    //~ MONO_ITEM fn take_foo::<char, [fn item {<char as Trait>::foo}: fn(char) -> char]>
+    //~ MONO_ITEM fn <[fn item {<char as Trait>::foo}: fn(char) -> char] as std::ops::Fn<(char,)>>::call - shim([fn item {<char as Trait>::foo}: fn(char) -> char])
     take_foo(Trait::foo, 'c');
 
-    //~ MONO_ITEM fn take_foo_mut::<u32, fn(u32) -> u32 {<u32 as Trait>::foo}>
-    //~ MONO_ITEM fn <fn(u32) -> u32 {<u32 as Trait>::foo} as std::ops::FnMut<(u32,)>>::call_mut - shim(fn(u32) -> u32 {<u32 as Trait>::foo})
+    //~ MONO_ITEM fn take_foo_mut::<u32, [fn item {<u32 as Trait>::foo}: fn(u32) -> u32]>
+    //~ MONO_ITEM fn <[fn item {<u32 as Trait>::foo}: fn(u32) -> u32] as std::ops::FnMut<(u32,)>>::call_mut - shim([fn item {<u32 as Trait>::foo}: fn(u32) -> u32])
     take_foo_mut(Trait::foo, 0u32);
 
-    //~ MONO_ITEM fn take_foo_mut::<char, fn(char) -> char {<char as Trait>::foo}>
-    //~ MONO_ITEM fn <fn(char) -> char {<char as Trait>::foo} as std::ops::FnMut<(char,)>>::call_mut - shim(fn(char) -> char {<char as Trait>::foo})
+    //~ MONO_ITEM fn take_foo_mut::<char, [fn item {<char as Trait>::foo}: fn(char) -> char]>
+    //~ MONO_ITEM fn <[fn item {<char as Trait>::foo}: fn(char) -> char] as std::ops::FnMut<(char,)>>::call_mut - shim([fn item {<char as Trait>::foo}: fn(char) -> char])
     take_foo_mut(Trait::foo, 'c');
 
     0