Skip to content

Commit c84a3a6

Browse files
long-long-floatlong-long-float
committed
Fix tests
1 parent 413e25b commit c84a3a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+134
-244
lines changed

‎tests/ui/argument-suggestions/basic.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ error[E0061]: this function takes 1 argument but 0 arguments were supplied
3333
--> $DIR/basic.rs:22:5
3434
|
3535
LL | missing();
36-
| ^^^^^^^-- an argument of type `u32` is missing
36+
| ^^^^^^^-- argument #1 of type `u32` is missing
3737
|
3838
note: function defined here
3939
--> $DIR/basic.rs:15:4
@@ -86,7 +86,7 @@ error[E0057]: this function takes 1 argument but 0 arguments were supplied
8686
--> $DIR/basic.rs:27:5
8787
|
8888
LL | closure();
89-
| ^^^^^^^-- an argument is missing
89+
| ^^^^^^^-- argument #1 is missing
9090
|
9191
note: closure defined here
9292
--> $DIR/basic.rs:26:19

‎tests/ui/argument-suggestions/display-is-suggestable.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0061]: this function takes 1 argument but 0 arguments were supplied
22
--> $DIR/display-is-suggestable.rs:6:5
33
|
44
LL | foo();
5-
| ^^^-- an argument of type `&dyn std::fmt::Display + Send` is missing
5+
| ^^^-- argument #1 of type `&dyn std::fmt::Display + Send` is missing
66
|
77
note: function defined here
88
--> $DIR/display-is-suggestable.rs:3:4

‎tests/ui/argument-suggestions/extern-fn-arg-names.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error[E0061]: this function takes 2 arguments but 1 argument was supplied
88
--> $DIR/extern-fn-arg-names.rs:7:5
99
|
1010
LL | dstfn(1);
11-
| ^^^^^--- #2 argument is missing
11+
| ^^^^^--- argument #2 is missing
1212
|
1313
note: function defined here
1414
--> $DIR/extern-fn-arg-names.rs:2:8

‎tests/ui/argument-suggestions/extra_arguments.stderr

Lines changed: 28 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ error[E0061]: this function takes 0 arguments but 2 arguments were supplied
1919
--> $DIR/extra_arguments.rs:20:3
2020
|
2121
LL | empty(1, 1);
22-
| ^^^^^ - - unexpected #2 argument of type `{integer}`
22+
| ^^^^^ - - unexpected argument #2 of type `{integer}`
2323
| |
24-
| unexpected #1 argument of type `{integer}`
24+
| unexpected argument #1 of type `{integer}`
2525
|
2626
note: function defined here
2727
--> $DIR/extra_arguments.rs:1:4
@@ -38,14 +38,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
3838
--> $DIR/extra_arguments.rs:22:3
3939
|
4040
LL | one_arg(1, 1);
41-
<<<<<<< HEAD
42-
| ^^^^^^^ - unexpected argument of type `{integer}`
43-
=======
44-
| ^^^^^^^ ---
45-
| | |
46-
| | unexpected #2 argument of type `{integer}`
47-
| help: remove the extra argument
48-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
41+
| ^^^^^^^ - unexpected argument #2 of type `{integer}`
4942
|
5043
note: function defined here
5144
--> $DIR/extra_arguments.rs:2:4
@@ -62,14 +55,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
6255
--> $DIR/extra_arguments.rs:23:3
6356
|
6457
LL | one_arg(1, "");
65-
<<<<<<< HEAD
66-
| ^^^^^^^ -- unexpected argument of type `&'static str`
67-
=======
68-
| ^^^^^^^ ----
69-
| | |
70-
| | unexpected #2 argument of type `&'static str`
71-
| help: remove the extra argument
72-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
58+
| ^^^^^^^ -- unexpected argument #2 of type `&'static str`
7359
|
7460
note: function defined here
7561
--> $DIR/extra_arguments.rs:2:4
@@ -86,9 +72,9 @@ error[E0061]: this function takes 1 argument but 3 arguments were supplied
8672
--> $DIR/extra_arguments.rs:24:3
8773
|
8874
LL | one_arg(1, "", 1.0);
89-
| ^^^^^^^ -- --- unexpected #3 argument of type `{float}`
75+
| ^^^^^^^ -- --- unexpected argument #3 of type `{float}`
9076
| |
91-
| unexpected #2 argument of type `&'static str`
77+
| unexpected argument #2 of type `&'static str`
9278
|
9379
note: function defined here
9480
--> $DIR/extra_arguments.rs:2:4
@@ -105,14 +91,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
10591
--> $DIR/extra_arguments.rs:26:3
10692
|
10793
LL | two_arg_same(1, 1, 1);
108-
<<<<<<< HEAD
109-
| ^^^^^^^^^^^^ - unexpected argument of type `{integer}`
110-
=======
111-
| ^^^^^^^^^^^^ ---
112-
| | |
113-
| | unexpected #3 argument of type `{integer}`
114-
| help: remove the extra argument
115-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
94+
| ^^^^^^^^^^^^ - unexpected argument #3 of type `{integer}`
11695
|
11796
note: function defined here
11897
--> $DIR/extra_arguments.rs:3:4
@@ -129,14 +108,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
129108
--> $DIR/extra_arguments.rs:27:3
130109
|
131110
LL | two_arg_same(1, 1, 1.0);
132-
<<<<<<< HEAD
133-
| ^^^^^^^^^^^^ --- unexpected argument of type `{float}`
134-
=======
135-
| ^^^^^^^^^^^^ -----
136-
| | |
137-
| | unexpected #3 argument of type `{float}`
138-
| help: remove the extra argument
139-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
111+
| ^^^^^^^^^^^^ --- unexpected argument #3 of type `{float}`
140112
|
141113
note: function defined here
142114
--> $DIR/extra_arguments.rs:3:4
@@ -153,14 +125,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
153125
--> $DIR/extra_arguments.rs:29:3
154126
|
155127
LL | two_arg_diff(1, 1, "");
156-
<<<<<<< HEAD
157-
| ^^^^^^^^^^^^ - unexpected argument of type `{integer}`
158-
=======
159-
| ^^^^^^^^^^^^ ---
160-
| | |
161-
| | unexpected #2 argument of type `{integer}`
162-
| help: remove the extra argument
163-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
128+
| ^^^^^^^^^^^^ - unexpected argument #2 of type `{integer}`
164129
|
165130
note: function defined here
166131
--> $DIR/extra_arguments.rs:4:4
@@ -177,14 +142,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
177142
--> $DIR/extra_arguments.rs:30:3
178143
|
179144
LL | two_arg_diff(1, "", "");
180-
<<<<<<< HEAD
181-
| ^^^^^^^^^^^^ -- unexpected argument of type `&'static str`
182-
=======
183-
| ^^^^^^^^^^^^ ----
184-
| | |
185-
| | unexpected #3 argument of type `&'static str`
186-
| help: remove the extra argument
187-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
145+
| ^^^^^^^^^^^^ -- unexpected argument #3 of type `&'static str`
188146
|
189147
note: function defined here
190148
--> $DIR/extra_arguments.rs:4:4
@@ -201,9 +159,9 @@ error[E0061]: this function takes 2 arguments but 4 arguments were supplied
201159
--> $DIR/extra_arguments.rs:31:3
202160
|
203161
LL | two_arg_diff(1, 1, "", "");
204-
| ^^^^^^^^^^^^ - -- unexpected #4 argument of type `&'static str`
162+
| ^^^^^^^^^^^^ - -- unexpected argument #4 of type `&'static str`
205163
| |
206-
| unexpected #2 argument of type `{integer}`
164+
| unexpected argument #2 of type `{integer}`
207165
|
208166
note: function defined here
209167
--> $DIR/extra_arguments.rs:4:4
@@ -220,9 +178,9 @@ error[E0061]: this function takes 2 arguments but 4 arguments were supplied
220178
--> $DIR/extra_arguments.rs:32:3
221179
|
222180
LL | two_arg_diff(1, "", 1, "");
223-
| ^^^^^^^^^^^^ - -- unexpected #4 argument of type `&'static str`
181+
| ^^^^^^^^^^^^ - -- unexpected argument #4 of type `&'static str`
224182
| |
225-
| unexpected #3 argument of type `{integer}`
183+
| unexpected argument #3 of type `{integer}`
226184
|
227185
note: function defined here
228186
--> $DIR/extra_arguments.rs:4:4
@@ -239,14 +197,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
239197
--> $DIR/extra_arguments.rs:35:3
240198
|
241199
LL | two_arg_same(1, 1, "");
242-
<<<<<<< HEAD
243-
| ^^^^^^^^^^^^ -- unexpected argument of type `&'static str`
244-
=======
245-
| ^^^^^^^^^^^^ --------
246-
| | |
247-
| | unexpected #3 argument of type `&'static str`
248-
| help: remove the extra argument
249-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
200+
| ^^^^^^^^^^^^ -- unexpected argument #3 of type `&'static str`
250201
|
251202
note: function defined here
252203
--> $DIR/extra_arguments.rs:3:4
@@ -263,14 +214,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
263214
--> $DIR/extra_arguments.rs:36:3
264215
|
265216
LL | two_arg_diff(1, 1, "");
266-
<<<<<<< HEAD
267-
| ^^^^^^^^^^^^ - unexpected argument of type `{integer}`
268-
=======
269-
| ^^^^^^^^^^^^ ---
270-
| | |
271-
| | unexpected #2 argument of type `{integer}`
272-
| help: remove the extra argument
273-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
217+
| ^^^^^^^^^^^^ - unexpected argument #2 of type `{integer}`
274218
|
275219
note: function defined here
276220
--> $DIR/extra_arguments.rs:4:4
@@ -286,24 +230,11 @@ LL + two_arg_diff(1, "");
286230
error[E0061]: this function takes 2 arguments but 3 arguments were supplied
287231
--> $DIR/extra_arguments.rs:37:3
288232
|
289-
<<<<<<< HEAD
290233
LL | two_arg_same(
291234
| ^^^^^^^^^^^^
292235
...
293236
LL | ""
294-
| -- unexpected argument of type `&'static str`
295-
=======
296-
LL | two_arg_same(
297-
| ^^^^^^^^^^^^
298-
LL | 1,
299-
LL | 1,
300-
| ______-
301-
LL | | ""
302-
| | --
303-
| |_____||
304-
| |help: remove the extra argument
305-
| unexpected #3 argument of type `&'static str`
306-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
237+
| -- unexpected argument #3 of type `&'static str`
307238
|
308239
note: function defined here
309240
--> $DIR/extra_arguments.rs:3:4
@@ -320,23 +251,11 @@ LL + 1
320251
error[E0061]: this function takes 2 arguments but 3 arguments were supplied
321252
--> $DIR/extra_arguments.rs:43:3
322253
|
323-
<<<<<<< HEAD
324254
LL | two_arg_diff(
325255
| ^^^^^^^^^^^^
326256
LL | 1,
327257
LL | 1,
328-
| - unexpected argument of type `{integer}`
329-
=======
330-
LL | two_arg_diff(
331-
| ^^^^^^^^^^^^
332-
LL | 1,
333-
| ______-
334-
LL | | 1,
335-
| | -
336-
| | |
337-
| |_____unexpected #2 argument of type `{integer}`
338-
| help: remove the extra argument
339-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
258+
| - unexpected argument #2 of type `{integer}`
340259
|
341260
note: function defined here
342261
--> $DIR/extra_arguments.rs:4:4
@@ -352,12 +271,12 @@ error[E0061]: this function takes 0 arguments but 2 arguments were supplied
352271
--> $DIR/extra_arguments.rs:8:9
353272
|
354273
LL | empty($x, 1);
355-
| ^^^^^ - unexpected #2 argument of type `{integer}`
274+
| ^^^^^ - unexpected argument #2 of type `{integer}`
356275
...
357276
LL | foo!(1, ~);
358277
| ----------
359278
| | |
360-
| | unexpected #1 argument of type `{integer}`
279+
| | unexpected argument #1 of type `{integer}`
361280
| in this macro invocation
362281
|
363282
note: function defined here
@@ -371,12 +290,12 @@ error[E0061]: this function takes 0 arguments but 2 arguments were supplied
371290
--> $DIR/extra_arguments.rs:14:9
372291
|
373292
LL | empty(1, $y);
374-
| ^^^^^ - unexpected #1 argument of type `{integer}`
293+
| ^^^^^ - unexpected argument #1 of type `{integer}`
375294
...
376295
LL | foo!(~, 1);
377296
| ----------
378297
| | |
379-
| | unexpected #2 argument of type `{integer}`
298+
| | unexpected argument #2 of type `{integer}`
380299
| in this macro invocation
381300
|
382301
note: function defined here
@@ -395,8 +314,8 @@ LL | empty($x, $y);
395314
LL | foo!(1, 1);
396315
| ----------
397316
| | | |
398-
| | | unexpected #2 argument of type `{integer}`
399-
| | unexpected #1 argument of type `{integer}`
317+
| | | unexpected argument #2 of type `{integer}`
318+
| | unexpected argument #1 of type `{integer}`
400319
| in this macro invocation
401320
|
402321
note: function defined here
@@ -410,14 +329,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
410329
--> $DIR/extra_arguments.rs:53:3
411330
|
412331
LL | one_arg(1, panic!());
413-
<<<<<<< HEAD
414-
| ^^^^^^^ -------- unexpected argument
415-
=======
416-
| ^^^^^^^ ----------
417-
| | |
418-
| | unexpected #2 argument
419-
| help: remove the extra argument
420-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
332+
| ^^^^^^^ -------- unexpected argument #2
421333
|
422334
note: function defined here
423335
--> $DIR/extra_arguments.rs:2:4
@@ -434,14 +346,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
434346
--> $DIR/extra_arguments.rs:54:3
435347
|
436348
LL | one_arg(panic!(), 1);
437-
<<<<<<< HEAD
438-
| ^^^^^^^ - unexpected argument of type `{integer}`
439-
=======
440-
| ^^^^^^^ ---
441-
| | |
442-
| | unexpected #2 argument of type `{integer}`
443-
| help: remove the extra argument
444-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
349+
| ^^^^^^^ - unexpected argument #2 of type `{integer}`
445350
|
446351
note: function defined here
447352
--> $DIR/extra_arguments.rs:2:4
@@ -458,14 +363,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
458363
--> $DIR/extra_arguments.rs:55:3
459364
|
460365
LL | one_arg(stringify!($e), 1);
461-
<<<<<<< HEAD
462-
| ^^^^^^^ - unexpected argument of type `{integer}`
463-
=======
464-
| ^^^^^^^ ---
465-
| | |
466-
| | unexpected #2 argument of type `{integer}`
467-
| help: remove the extra argument
468-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
366+
| ^^^^^^^ - unexpected argument #2 of type `{integer}`
469367
|
470368
note: function defined here
471369
--> $DIR/extra_arguments.rs:2:4
@@ -482,14 +380,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
482380
--> $DIR/extra_arguments.rs:60:3
483381
|
484382
LL | one_arg(for _ in 1.. {}, 1);
485-
<<<<<<< HEAD
486-
| ^^^^^^^ - unexpected argument of type `{integer}`
487-
=======
488-
| ^^^^^^^ ---
489-
| | |
490-
| | unexpected #2 argument of type `{integer}`
491-
| help: remove the extra argument
492-
>>>>>>> c71324b4859 (Use ordinal number in argument error)
383+
| ^^^^^^^ - unexpected argument #2 of type `{integer}`
493384
|
494385
note: function defined here
495386
--> $DIR/extra_arguments.rs:2:4

‎tests/ui/argument-suggestions/issue-100478.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ error[E0061]: this function takes 3 arguments but 1 argument was supplied
44
LL | three_diff(T2::new(0));
55
| ^^^^^^^^^^------------
66
| ||
7-
| |#1 argument of type `T1` is missing
8-
| #3 argument of type `T3` is missing
7+
| |argument #1 of type `T1` is missing
8+
| argument #3 of type `T3` is missing
99
|
1010
note: function defined here
1111
--> $DIR/issue-100478.rs:30:4
@@ -63,7 +63,7 @@ LL | foo(
6363
| ^^^
6464
...
6565
LL | p3, p4, p5, p6, p7, p8,
66-
| -- #2 argument of type `Arc<T2>` is missing
66+
| -- argument #2 of type `Arc<T2>` is missing
6767
|
6868
note: function defined here
6969
--> $DIR/issue-100478.rs:29:4

0 commit comments

Comments
 (0)