Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Classify BinaryHeap & LinkedList unit tests as such #94126

Merged
merged 1 commit into from
May 2, 2022
Merged

Classify BinaryHeap & LinkedList unit tests as such #94126

merged 1 commit into from
May 2, 2022

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Feb 18, 2022

All but one of these so-called integration test case are unit tests, just like btree's were (#75531). In addition, reunite the unit tests of linked_list that were split off during #23104 because they needed to remain unit tests (they were later moved to the separate file they are in during #63207). The two sets could remain separate files, but I opted to merge them back together, more or less in the order they used to be, apart from one duplicate name test_split_off and one duplicate tiny function list_from.

@rust-highfive
Copy link
Contributor

r? @yaahc

(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 Feb 18, 2022
@ssomers ssomers mentioned this pull request Feb 19, 2022
Merged
@bors
Copy link
Collaborator

bors commented Mar 11, 2022

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

@yaahc yaahc added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Mar 18, 2022
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 24, 2022
@yaahc
Copy link
Member

yaahc commented Apr 29, 2022 •
edited
Loading

I'm reassigning this PR because I'm taking a break from the review rotation for a little while. Thank you for your patience.

r? rust-lang/libs

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 30, 2022

📌 Commit a3a5d83 has been approved by Mark-Simulacrum

@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 Apr 30, 2022
@bors
Copy link
Collaborator

bors commented May 1, 2022

⌛ Testing commit a3a5d83 with merge 70d22763c74ed679957e72e1f36e0e60941977be...

@bors
Copy link
Collaborator

bors commented May 1, 2022

💔 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 May 1, 2022
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
.......... (60/62)
.         (62/62)


/checkout/src/test/rustdoc-gui/search-result-display.goml search-result-display... FAILED
[ERROR] (line 5) TimeoutError: waiting for selector "#search-settings" failed: timeout 30000ms exceeded: for command `wait-for: "#search-settings"`
Build completed unsuccessfully in 0:00:45

@Mark-Simulacrum
Copy link
Member

@bors retry waiting for selector search-settings timed out rustdoc-gui

@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 May 1, 2022
@JohnTitor JohnTitor mentioned this pull request May 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 2, 2022
@bors
Auto merge of rust-lang#96622 - JohnTitor:rollup-8hckgaj, r=JohnTitor
f6cbc92 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#94126 (Classify BinaryHeap & LinkedList unit tests as such)
 - rust-lang#96222 (Clarify docs for `from_raw_parts` on `Vec` and `String`)
 - rust-lang#96499 (Make it possible to write doctests for bootstrap)
 - rust-lang#96567 (Fix docs for u32 and i32 logs func)
 - rust-lang#96568 (std::fmt: Various fixes and improvements to documentation)
 - rust-lang#96571 (Add a bathroom stall to weird expressions test)
 - rust-lang#96610 (Update browser-ui-test version to 0.9.0)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ddfc65d into rust-lang:master May 2, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 2, 2022
@ssomers ssomers deleted the alloc_prep_1 branch May 2, 2022 08:01
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.62.0
Development

Successfully merging this pull request may close these issues.
8 participants
@ssomers @rust-highfive @bors @yaahc @Mark-Simulacrum @rust-log-analyzer @JohnCSimon @rustbot