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

handle generic trait methods in coverage-report tests #80761

Merged
merged 1 commit into from
Jan 8, 2021
Merged

handle generic trait methods in coverage-report tests #80761

merged 1 commit into from
Jan 8, 2021

Conversation

andjo403
Copy link
Contributor

@andjo403 andjo403 commented Jan 6, 2021 •
edited
Loading

also make the generic function pattern more specific.

r? @wesleywiser
as this was failing the test of #76896

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 6, 2021
@andjo403
Copy link
Contributor Author

andjo403 commented Jan 6, 2021

the types of generic instantiations that I found was
| <generics::Firework<f64>>::set_strength: that was not handled by any pattern and
| used_crate::used_only_from_bin_crate_generic_function::<&alloc::vec::Vec<i32>>: that hade a pattern with an extra $ that failed the match

wesleywiser
wesleywiser approved these changes Jan 7, 2021
View reviewed changes
Copy link
Member

@wesleywiser wesleywiser left a comment

Choose a reason for hiding this comment

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

Awesome, thanks so much!

@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 7, 2021

📌 Commit 3f74fbd has been approved by wesleywiser

@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 Jan 7, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 7, 2021
@Dylan-DPC
Rollup merge of rust-lang#80761 - andjo403:generic_coverage, r=wesley…
38ccca7 
…wiser

handle generic trait methods in coverage-report tests

also make the generic function pattern more specific and remove the extra $ that fails the matching.

r? `@wesleywiser`
as this was failing the test of rust-lang#76896
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jan 7, 2021
Closed
@JohnTitor
Copy link
Member

Failed in rollup: https://github.com/rust-lang-ci/rust/runs/1662914291
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 7, 2021
@andjo403
handle generic trait methods in coverage tests
4f6305b 
make the generic function pattern more specific
@andjo403
Copy link
Contributor Author

andjo403 commented Jan 7, 2021

@wesleywiser have fixed the fault.
had only tested the command on the command line as I do not know how to trigger this case and did not understand that to write a $ sign in make you have to write $$ have fixed it now.

@spastorino
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 7, 2021

📌 Commit 4f6305b has been approved by spastorino

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 7, 2021
@JohnTitor JohnTitor mentioned this pull request Jan 8, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 8, 2021
@bors
Auto merge of rust-lang#80806 - JohnTitor:rollup-y64z7ph, r=JohnTitor
9155a9d 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#79675 (Make sure rust-call errors occur correctly for traits)
 - rust-lang#80372 (Don't panic when an external crate can't be resolved)
 - rust-lang#80761 (handle generic trait methods in coverage-report tests)
 - rust-lang#80785 (rustc_ast_pretty: Remove `PrintState::insert_extra_parens`)
 - rust-lang#80791 (Fix type name in doc example for Iter and IterMut)
 - rust-lang#80794 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)
 - rust-lang#80799 (Get rid of custom pretty-printing in rustdoc)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c851ae9 into rust-lang:master Jan 8, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 8, 2021
@andjo403 andjo403 deleted the generic_coverage branch January 8, 2021 08:04
@andjo403 andjo403 restored the generic_coverage branch January 9, 2021 08:21
@andjo403 andjo403 deleted the generic_coverage branch January 9, 2021 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spastorino spastorino spastorino approved these changes

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

Labels
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.51.0
Development

Successfully merging this pull request may close these issues.
7 participants
@andjo403 @wesleywiser @bors @JohnTitor @spastorino @rust-highfive @rustbot