Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 11 pull requests #86527

Merged
merged 28 commits into from
Jun 22, 2021
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5bbf8cf
Revert SGX inline asm syntax
May 7, 2021
08d44c2
Implement `Cursor::{remaining, is_empty}`
soerenmeier Jun 5, 2021
5fb2986
format symbols under shared frames
KodrAus Dec 4, 2020
8423a19
make both panic display formats collapse frames
KodrAus Dec 16, 2020
95c1bf6
Allow to pass arguments to rustdoc-gui tool
GuillaumeGomez Jun 14, 2021
212e91a
Update tracking issue
soerenmeier Jun 16, 2021
503abc7
add regression test for issue #39161
yerke Jun 16, 2021
636170a
Remove `#[allow(unused_lifetimes)]` which is now unnecessary
JohnTitor Jun 16, 2021
664bde0
rename `remaining` to `remaining_slice` and add a new `remaining`
soerenmeier Jun 17, 2021
13bfbb4
Fix comment about rustc_inherit_overflow_checks in abs().
m-ou-se Jun 16, 2021
22029a2
add regression test for issue #54685
yerke Jun 18, 2021
4cd2fab
Specify if struct/enum in arg mismatch error
syvb Jun 20, 2021
9063eda
Move `available_concurrency` implementation to `sys`
CDirkx Apr 29, 2021
dd90900
Resolve type aliases to the type they point to in intra-doc links
LeSeulArtichaut Jun 15, 2021
05ec710
Remove tidy exception for `available_concurrency`
CDirkx May 11, 2021
888418a
Use `Unsupported` on platforms where `available_concurrency` is not i…
CDirkx Jun 21, 2021
b8a7bfb
Reference issue test originated from
syvb Jun 21, 2021
d6e344d
Rollup merge of #85054 - jethrogb:jb/sgx-inline-asm, r=Amanieu
JohnTitor Jun 21, 2021
7f1a4a2
Rollup merge of #85182 - CDirkx:available_concurrency, r=JohnTitor
JohnTitor Jun 21, 2021
4463b08
Rollup merge of #86037 - soerenmeier:cursor_remaining, r=yaahc
JohnTitor Jun 21, 2021
7ee6b8b
Rollup merge of #86114 - JDuchniewicz:feat/panic-frame-fmt, r=yaahc
JohnTitor Jun 21, 2021
7dca2e2
Rollup merge of #86297 - GuillaumeGomez:rustdoc-gui-args, r=Mark-Simu…
JohnTitor Jun 21, 2021
83d9b1b
Rollup merge of #86334 - LeSeulArtichaut:86120-links-type-aliases, r=…
JohnTitor Jun 21, 2021
8389cd3
Rollup merge of #86367 - m-ou-se:fix-abs-comment, r=scottmcm
JohnTitor Jun 21, 2021
4d73300
Rollup merge of #86381 - yerke:add-test-for-issue-39161, r=JohnTitor
JohnTitor Jun 21, 2021
d285235
Rollup merge of #86387 - JohnTitor:now-no-unused-lifetimes, r=Mark-Si…
JohnTitor Jun 21, 2021
fdb1daa
Rollup merge of #86398 - yerke:add-test-for-issue-54685, r=Mark-Simul…
JohnTitor Jun 21, 2021
4495ce7
Rollup merge of #86493 - Smittyvb:ctor-typeck-error, r=davidtwco
JohnTitor Jun 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/test/ui/typeck/struct-enum-wrong-args.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Regression test of #86481.
struct Wrapper(i32);
struct DoubleWrapper(i32, i32);

16 changes: 8 additions & 8 deletions src/test/ui/typeck/struct-enum-wrong-args.stderr
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
error[E0061]: this enum variant takes 1 argument but 2 arguments were supplied
--> $DIR/struct-enum-wrong-args.rs:5:13
--> $DIR/struct-enum-wrong-args.rs:6:13
|
LL | let _ = Some(3, 2);
| ^^^^ - - supplied 2 arguments
| |
| expected 1 argument

error[E0061]: this enum variant takes 1 argument but 3 arguments were supplied
--> $DIR/struct-enum-wrong-args.rs:6:13
--> $DIR/struct-enum-wrong-args.rs:7:13
|
LL | let _ = Ok(3, 6, 2);
| ^^ - - - supplied 3 arguments
| |
| expected 1 argument

error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
--> $DIR/struct-enum-wrong-args.rs:7:13
--> $DIR/struct-enum-wrong-args.rs:8:13
|
LL | let _ = Ok();
| ^^-- supplied 0 arguments
| |
| expected 1 argument

error[E0061]: this struct takes 1 argument but 0 arguments were supplied
--> $DIR/struct-enum-wrong-args.rs:8:13
--> $DIR/struct-enum-wrong-args.rs:9:13
|
LL | let _ = Wrapper();
| ^^^^^^^-- supplied 0 arguments
| |
| expected 1 argument

error[E0061]: this struct takes 1 argument but 2 arguments were supplied
--> $DIR/struct-enum-wrong-args.rs:9:13
--> $DIR/struct-enum-wrong-args.rs:10:13
|
LL | let _ = Wrapper(5, 2);
| ^^^^^^^ - - supplied 2 arguments
| |
| expected 1 argument

error[E0061]: this struct takes 2 arguments but 0 arguments were supplied
--> $DIR/struct-enum-wrong-args.rs:10:13
--> $DIR/struct-enum-wrong-args.rs:11:13
|
LL | let _ = DoubleWrapper();
| ^^^^^^^^^^^^^-- supplied 0 arguments
| |
| expected 2 arguments

error[E0061]: this struct takes 2 arguments but 1 argument was supplied
--> $DIR/struct-enum-wrong-args.rs:11:13
--> $DIR/struct-enum-wrong-args.rs:12:13
|
LL | let _ = DoubleWrapper(5);
| ^^^^^^^^^^^^^ - supplied 1 argument
| |
| expected 2 arguments

error[E0061]: this struct takes 2 arguments but 3 arguments were supplied
--> $DIR/struct-enum-wrong-args.rs:12:13
--> $DIR/struct-enum-wrong-args.rs:13:13
|
LL | let _ = DoubleWrapper(5, 2, 7);
| ^^^^^^^^^^^^^ - - - supplied 3 arguments