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.

Sign up for GitHub

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

Jump to bottom

Add a bunch of const-generic revisions for min_const_generics #75322

Merged
merged 3 commits into from
Aug 13, 2020
Merged

Add a bunch of const-generic revisions for min_const_generics #75322

merged 3 commits into from
Aug 13, 2020

Conversation

JulianKnodt
Copy link
Contributor

This adds a bunch of revisions to const-generic tests which is part of #75279, but doesn't cover everything.

r? @lcnr

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 9, 2020
@JulianKnodt JulianKnodt force-pushed the revisions branch 2 times, most recently from d2fe81d to 0f14e6b Compare August 9, 2020 21:23
lcnr
lcnr reviewed Aug 10, 2020
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks 👍

Rn there are a lot of stale testname.stderr files (as we now have testname.full.stderr and testname.min.stderr).

It's probably easiest to delete all stderr files in src/test/ui/const-generics and then rerun the tests

src/test/ui/const-generics/array-size-in-generic-struct-param.rs Outdated Show resolved Hide resolved
src/test/ui/const-generics/condition-in-trait-const-arg.rs Outdated Show resolved Hide resolved
src/test/ui/const-generics/const-arg-in-fn.rs Outdated Show resolved Hide resolved
src/test/ui/const-generics/const-argument-non-static-lifetime.rs Outdated Show resolved Hide resolved
src/test/ui/const-generics/const-fn-with-const-param.rs Outdated Show resolved Hide resolved
src/test/ui/const-generics/different_byref.rs Show resolved Hide resolved
src/test/ui/const-generics/integer-literal-generic-arg-in-where-clause.rs Show resolved Hide resolved
src/test/ui/const-generics/raw-ptr-const-param-deref.rs Outdated Show resolved Hide resolved
src/test/ui/const-generics/slice-const-param-mismatch.rs Outdated Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Aug 11, 2020

☔ The latest upstream changes (presumably #74005) made this pull request unmergeable. Please resolve the merge conflicts.

@JulianKnodt JulianKnodt force-pushed the revisions branch 2 times, most recently from e344a5c to ca6e996 Compare August 11, 2020 04:30
@lcnr
Copy link
Contributor

lcnr commented Aug 11, 2020 •
edited

@bors r+ rollup=iffy

affects nearly all tests in src/test/ui/const-generics.

@bors

This comment has been minimized.

Sign in to view
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 11, 2020
@bors

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Aug 11, 2020

📌 Commit ca6e996fc61c36f37381fca9a386d2ec1b740630 has been approved by lcnr

@bors
Copy link
Contributor

bors commented Aug 11, 2020

⌛ Testing commit ca6e996fc61c36f37381fca9a386d2ec1b740630 with merge 898cd8acf6d8d354451bebd4cf7d07079076a033...

@bors
Copy link
Contributor

bors commented Aug 11, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 11, 2020
@lcnr
Copy link
Contributor

lcnr commented Aug 11, 2020

network

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 11, 2020
@bors
Copy link
Contributor

bors commented Aug 11, 2020

⌛ Testing commit ca6e996fc61c36f37381fca9a386d2ec1b740630 with merge 098a5b6ba72225e0551a197d7478c9e1fb8c4313...

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 11, 2020
@lcnr
Copy link
Contributor

lcnr commented Aug 11, 2020 •
edited

seems like bors has some problems again 🤔 cc @rust-lang/infra

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 11, 2020
@bors
Copy link
Contributor

bors commented Aug 11, 2020

⌛ Testing commit ca6e996fc61c36f37381fca9a386d2ec1b740630 with merge 0a410faa22b14680989543721516a350f3f58aec...

@bors
Copy link
Contributor

bors commented Aug 11, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 11, 2020
@lcnr
Copy link
Contributor

lcnr commented Aug 11, 2020

that one is actually legit.

@JulianKnodt seems like you have to rebase and rerun the test suite because of #75359

@JulianKnodt
Add a bunch of revisions
be650a7 
This adds a bunch of revisions to const-generic tests
@JulianKnodt
Add missing tests in root const-gen dir
9bf40f1
@JulianKnodt
Update stderr files
5c0b416 
And also fix some comments as suggested by lcnr
@lcnr
Copy link
Contributor

lcnr commented Aug 13, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Aug 13, 2020

📌 Commit 5c0b416 has been approved by lcnr

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2020
@bors
Copy link
Contributor

bors commented Aug 13, 2020

⌛ Testing commit 5c0b416 with merge 1a7d9f5...

@bors
Copy link
Contributor

bors commented Aug 13, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: lcnr
Pushing 1a7d9f5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 13, 2020
@bors bors merged commit 1a7d9f5 into rust-lang:master Aug 13, 2020
This was referenced Aug 13, 2020
Merged
Merged
@lcnr lcnr added the F-const_generics `#![feature(const_generics)]` label Nov 14, 2020
@lcnr lcnr mentioned this pull request Nov 17, 2020
Closed
16 tasks
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr approved these changes

Assignees

@lcnr lcnr

Labels
F-const_generics `#![feature(const_generics)]` merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@JulianKnodt @bors @lcnr @cuviper @rust-highfive