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

Simplify the collecting of ? Trait bounds in where clause #87338

Merged
merged 2 commits into from
Jul 24, 2021

Conversation

SparrowLii
Copy link
Member

@SparrowLii SparrowLii commented Jul 21, 2021

This PR fixes the FIXME about using less rightward drift and only one error reporting when collecting of ?Trait bounds in where clause.
Checking whether the path length of bound_ty is 1 can be replaced by whether unresolved_segments in the partial_res is 0.
Checking whether the param.kind is Type{...} can also be omitted. One Fx hash calculation will be done for Const or Lifetime param, but the impact on efficiency should be small IMO

@rust-highfive
Copy link
Collaborator

r? @wesleywiser

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 21, 2021
@wesleywiser
Copy link
Member

Thanks, LGTM!

Let's do a perf run just to be sure there isn't much of an impact.

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 22, 2021
@bors
Copy link
Contributor

bors commented Jul 22, 2021

⌛ Trying commit 0f5bfc2 with merge 12fa27618837d6c2baa39ce6230ce51fab72cc8b...

@bors
Copy link
Contributor

bors commented Jul 22, 2021

💔 Test failed - checks-actions

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 22, 2021
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
From https://github.com/rust-lang/miri
 * branch              062cf07d98822beb4c5b1132f47b4397275f403a -> FETCH_HEAD
 * branch              06758c48bd7a77bb5aa43fc50cf344540ba5afef -> FETCH_HEAD
 * branch              dd7f545a69e4b720407e458bf4ade0b207bbf9ee -> FETCH_HEAD
fatal: remote error: upload-pack: not our ref 9ad6e5b8f68ee4bcd85886e50b8b0a70cbb91a52
Errors during submodule fetch:
##[error]Process completed with exit code 1.
Post job cleanup.

@wesleywiser
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jul 22, 2021

⌛ Trying commit 0f5bfc2 with merge 28412d0793bff25304c9c359ae4103c872fb090b...

@bors
Copy link
Contributor

bors commented Jul 22, 2021

☀️ Try build successful - checks-actions
Build commit: 28412d0793bff25304c9c359ae4103c872fb090b (28412d0793bff25304c9c359ae4103c872fb090b)

@rust-timer
Copy link
Collaborator

Queued 28412d0793bff25304c9c359ae4103c872fb090b with parent e742158, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (28412d0793bff25304c9c359ae4103c872fb090b): comparison url.

Summary: This benchmark run did not return any significant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jul 22, 2021
@SparrowLii
Copy link
Member Author

Thanks for reviewing! I'm happy it is helpful

@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 23, 2021

📌 Commit 0f5bfc2 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-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 23, 2021
@bors
Copy link
Contributor

bors commented Jul 24, 2021

⌛ Testing commit 0f5bfc2 with merge d03456d...

@bors
Copy link
Contributor

bors commented Jul 24, 2021

☀️ Test successful - checks-actions
Approved by: wesleywiser
Pushing d03456d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 24, 2021
@bors bors merged commit d03456d into rust-lang:master Jul 24, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

7 participants