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

VecMap::get_value_matching should return just one element #86410

Merged
merged 2 commits into from
Jul 23, 2021
Merged

VecMap::get_value_matching should return just one element #86410

merged 2 commits into from
Jul 23, 2021

Conversation

spastorino
Copy link
Member

@spastorino spastorino commented Jun 17, 2021 •
edited
Loading

r? @nikomatsakis

Related to #86465 and #87287

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 17, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from 95a327b to 3b1b584 Compare June 17, 2021 19:37
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from 3b1b584 to bae8e68 Compare June 17, 2021 19:52
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from bae8e68 to 50cc3de Compare June 17, 2021 19:59
@rust-log-analyzer

This comment has been minimized.

Sign in to view
nikomatsakis
nikomatsakis requested changes Jun 23, 2021
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

(We discussed the proper fix on zulip, still waiting on that)

@spastorino spastorino force-pushed the get_value_matching branch 3 times, most recently from 662b6c4 to 3aa79a3 Compare June 25, 2021 22:06
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from 3aa79a3 to 21fd769 Compare June 26, 2021 13:00
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from 21fd769 to ce4e0b4 Compare June 28, 2021 15:24
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from ce4e0b4 to 482db08 Compare June 30, 2021 21:18
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from 482db08 to 87fa875 Compare June 30, 2021 21:29
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the get_value_matching branch from 87fa875 to 16c9ba2 Compare July 1, 2021 11:43
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nikomatsakis nikomatsakis mentioned this pull request Jul 12, 2021
Closed
@oli-obk oli-obk mentioned this pull request Jul 13, 2021
Merged
@oli-obk oli-obk force-pushed the get_value_matching branch from 113bd9a to ac32b5e Compare July 13, 2021 17:05
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 16, 2021
@GuillaumeGomez
Rollup merge of rust-lang#87107 - oli-obk:tait_double, r=nikomatsakis
f5f821b 
Loop over all opaque types instead of looking at just the first one with the same DefId

This exposed a bug in VecMap and is needed for rust-lang#86410 anyway

r? `@spastorino`

cc `@nikomatsakis`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 16, 2021
@GuillaumeGomez
Rollup merge of rust-lang#87107 - oli-obk:tait_double, r=nikomatsakis
8273567 
Loop over all opaque types instead of looking at just the first one with the same DefId

This exposed a bug in VecMap and is needed for rust-lang#86410 anyway

r? ``@spastorino``

cc ``@nikomatsakis``
@bors
Copy link
Contributor

bors commented Jul 20, 2021

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

@nikomatsakis
Copy link
Contributor

r? @oli-obk

@spastorino spastorino force-pushed the get_value_matching branch from 9918f4d to 09b9a69 Compare July 22, 2021 21:24
@spastorino spastorino added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 22, 2021
@spastorino
Copy link
Member Author

spastorino commented Jul 22, 2021 •
edited
Loading

This is blocked on #87287, being merged before. Have just rebased this PR on top of #87287, once that PR is in we would need to rebase on top of master.

@spastorino spastorino force-pushed the get_value_matching branch from 09b9a69 to 914b592 Compare July 22, 2021 21:39
@spastorino
Add VecMap::get_value_matching and assert if > 1 element
d714107 
Otherwise is a bug that we want to uncover.
@spastorino spastorino force-pushed the get_value_matching branch from 914b592 to 07cd317 Compare July 23, 2021 11:44
@spastorino spastorino force-pushed the get_value_matching branch 2 times, most recently from 56e1f1e to c79df85 Compare July 23, 2021 13:18
@oli-obk
Copy link
Contributor

oli-obk commented Jul 23, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jul 23, 2021

📌 Commit c79df85 has been approved by oli-obk

@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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jul 23, 2021
@spastorino
Copy link
Member Author

@bors rollup=always

@JohnTitor JohnTitor mentioned this pull request Jul 23, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2021
@bors
Auto merge of rust-lang#87413 - JohnTitor:rollup-dht22jk, r=JohnTitor
67b0300 
Rollup of 14 pull requests

Successful merges:

 - rust-lang#86410 (VecMap::get_value_matching should return just one element)
 - rust-lang#86790 (Document iteration order of `retain` functions)
 - rust-lang#87171 (Remove Option from BufWriter)
 - rust-lang#87175 (Stabilize `into_parts()` and `into_error()`)
 - rust-lang#87185 (Fix panics on Windows when the build was cancelled)
 - rust-lang#87191 (Package LLVM libs for the target rather than the build host)
 - rust-lang#87255 (better support for running libcore tests with Miri)
 - rust-lang#87266 (Add testcase for 87076)
 - rust-lang#87283 (Add `--codegen-backends=foo,bar` configure flag)
 - rust-lang#87322 (fix: clarify suggestion that `&T` must refer to `T: Sync` for `&T: Send`)
 - rust-lang#87358 (Fix `--dry-run` when download-ci-llvm is set)
 - rust-lang#87380 (Don't default to `submodules = true` unless the rust repo has a .git directory)
 - rust-lang#87398 (Add test for fonts used for module items)
 - rust-lang#87412 (Add missing article)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d453290 into rust-lang:master Jul 23, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

@nikomatsakis nikomatsakis nikomatsakis requested changes

Assignees

@oli-obk oli-obk

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.55.0
Development

Successfully merging this pull request may close these issues.
7 participants
@spastorino @rust-log-analyzer @bors @nikomatsakis @oli-obk @rust-highfive @rustbot