Skip to content

Refactor TinyList::contains and len to iterate instead of recurse - #62744

Merged
bors merged 2 commits into
rust-lang:masterfrom
llogiq:tiny-list-refactor
Aug 25, 2019
Merged

Refactor TinyList::contains and len to iterate instead of recurse#62744
bors merged 2 commits into
rust-lang:masterfrom
llogiq:tiny-list-refactor

Conversation

@llogiq

@llogiqllogiq commented Jul 17, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Jul 17, 2019

Copy link
Copy Markdown
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 17, 2019
@Alexendoo

Alexendoo commented Jul 24, 2019

Copy link
Copy Markdown
Member

Ping from triage, any updates? @eddyb

@bors

bors commented Aug 2, 2019

Copy link
Copy Markdown
Collaborator

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

@llogiq
llogiqforce-pushed the tiny-list-refactor branch from 6704bab to 599cf2eCompareAugust 5, 2019 09:34
@llogiq

llogiq commented Aug 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Rebased.

eddyb
eddyb reviewed Aug 9, 2019
View reviewed changes
Comment threadsrc/librustc_data_structures/tiny_list/tests.rs Outdated
eddyb
eddyb approved these changes Aug 9, 2019
View reviewed changes

@eddybeddyb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

r=me with benches fixed

@llogiq
llogiqforce-pushed the tiny-list-refactor branch from 599cf2e to 8661a9cCompareAugust 12, 2019 20:17
eddyb
eddyb reviewed Aug 13, 2019
View reviewed changes
Comment threadsrc/librustc_data_structures/tiny_list/tests.rs Outdated
eddyb
eddyb reviewed Aug 13, 2019
View reviewed changes
Comment threadsrc/librustc_data_structures/tiny_list/tests.rs Outdated
@llogiq
llogiqforce-pushed the tiny-list-refactor branch from 8661a9c to 45f14a8CompareAugust 13, 2019 20:03
@llogiq

llogiq commented Aug 16, 2019

Copy link
Copy Markdown
ContributorAuthor

@eddyb r?

@eddybeddyb 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 Aug 18, 2019
@JohnCSimon

JohnCSimon commented Aug 24, 2019

Copy link
Copy Markdown

Ping from triage
@llogiq@eddyb I'm not sure why this is in s-waiting-on-author instead of s-waiting-on-review
what is the state of this PR?
thank you!

@llogiq

llogiq commented Aug 24, 2019

Copy link
Copy Markdown
ContributorAuthor

I made the changes to the benchmarks as requested. @eddyb please clarify what is missing.

@eddyb

eddyb commented Aug 24, 2019

Copy link
Copy Markdown
Contributor

@llogiq Oops, you didn't mark the comments as resolved and GitHub didn't say "outdated" because you just added a line afterwards... So I thought you hadn't done those changes yet, my bad.

@bors r+

@bors

bors commented Aug 24, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 45f14a8 has been approved by eddyb

@borsbors 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 Aug 24, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 25, 2019
@Centril
Rollup merge ofrust-lang#62744- llogiq:tiny-list-refactor, r=eddyb
5761fc7
Refactor `TinyList::contains` and `len` to iterate instead of recurse
None
@CentrilCentril mentioned this pull request Aug 25, 2019
Merged
bors added a commit that referenced this pull request Aug 25, 2019
@bors
Auto merge of#63873- Centril:rollup-jgglypd, r=Centril
9267119
Rollup of 6 pull requests
Successful merges:
- #62744 (Refactor `TinyList::contains` and `len` to iterate instead of recurse)
- #63813 (Do not suggest `.try_into()` on `i32::from(x)`)
- #63833 (Suggest calling closure with resolved return type when appropriate)
- #63839 (Ensure miri can do bit ops on pointer values)
- #63854 (Modifies how Arg, Arm, Field, FieldPattern and Variant are visited)
- #63859 (Don't unwrap the result of `span_to_snippet`)
Failed merges:
r? @ghost
@bors
bors merged commit 45f14a8 into rust-lang:masterAug 25, 2019
@llogiq
llogiq deleted the tiny-list-refactor branch August 25, 2019 06:28
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@llogiq@rust-highfive@Alexendoo@bors@JohnCSimon@eddyb