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

Stabilize vec_spare_capacity #93016

Merged
merged 1 commit into from
Jan 18, 2022
Merged

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented Jan 17, 2022

Closes #75017

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 17, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ per FCP in #75017 (comment)

@bors
Copy link
Contributor

bors commented Jan 17, 2022

📌 Commit e012b9a 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 Jan 17, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2022
…askrgr

Rollup of 14 pull requests

Successful merges:

 - rust-lang#92629 (Pick themes on settings page, not every page)
 - rust-lang#92640 (Fix ICEs related to `Deref<Target=[T; N]>` on newtypes)
 - rust-lang#92701 (Add some more attribute validation)
 - rust-lang#92803 (Hide mobile sidebar on some clicks)
 - rust-lang#92830 (Rustdoc style cleanups)
 - rust-lang#92866 ("Does exists" typos fix)
 - rust-lang#92870 (add `rustc_diagnostic_item` attribute to `AtomicBool` type)
 - rust-lang#92914 (htmldocck: Add support for `/text()` in ``@snapshot`)`
 - rust-lang#92923 (Abstract the pretty printer's ringbuffer to be infinitely sized)
 - rust-lang#92946 (Exclude llvm-libunwind from the self-contained set on s390x-musl targets)
 - rust-lang#92947 (rustdoc: Use `intersperse` in a `visit_path` function)
 - rust-lang#92997 (Add `~const` bound test for negative impls)
 - rust-lang#93004 (update codegen test for LLVM 14)
 - rust-lang#93016 (Stabilize vec_spare_capacity)

Failed merges:

 - rust-lang#92924 (Delete pretty printer tracing)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 83b1a94 into rust-lang:master Jan 18, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 18, 2022
@jethrogb
Copy link
Contributor

This stdarch commit is not in any branch. Can this PR be reverted? See #75109 for why this is bad.

@Amanieu
Copy link
Member Author

Amanieu commented Jan 18, 2022

I was hoping to merge rust-lang/stdarch#1272 once a new nightly comes out tonight.

Amanieu added a commit to Amanieu/rust that referenced this pull request Jan 18, 2022
PR rust-lang#93016 was merged with the stdarch submodule pointing to a commit in
a PR branch and not in master. This was due to a circular dependency
between the rust and stdarch changes which would cause the other to fail
to build.

cc rust-lang#75109
@Amanieu
Copy link
Member Author

Amanieu commented Jan 18, 2022

I merged the stdarch PR and opened #93035.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 18, 2022
Fix stdarch submodule pointing to commit outside tree

PR rust-lang#93016 was merged with the stdarch submodule pointing to a commit in
a PR branch and not in master. This was due to a circular dependency
between the rust and stdarch changes which would cause the other to fail
to build.

cc rust-lang#75109
nyurik added a commit to nyurik/osmpbf that referenced this pull request Jul 1, 2022
protobuf uses spare_capacity_mut on vectors that was stabilized in 1.60
rust-lang/rust#93016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Tracking Issue for Vec::spare_capacity_mut
6 participants