Don't re-export private/unstable ArgumentV1 from alloc.#101569
Don't re-export private/unstable ArgumentV1 from alloc.#101569bors merged 2 commits intorust-lang:masterfrom
alloc.#101569Conversation
This comment was marked as outdated.
This comment was marked as outdated.
|
r? @thomcc (rust-highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
thomcc
left a comment
There was a problem hiding this comment.
Looks good, r=me once CI passes (looks like it either needs reformatting or a tidy bless)
94a1b6b to
fdc6d1a
Compare
|
@bors r=thomcc |
|
📌 Commit fdc6d1ade8a137e11a4de603a29de238964bbdcf has been approved by It is now in the queue for this repository. |
|
⌛ Testing commit fdc6d1ade8a137e11a4de603a29de238964bbdcf with merge dad3e742eec65f900b36f21e3951760858bbd1de... |
|
💔 Test failed - checks-actions |
|
@rustbot author |
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #105667) made this pull request unmergeable. Please resolve the merge conflicts. |
|
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
fdc6d1a to
47adb65
Compare
|
@bors r=thomcc |
Rollup of 6 pull requests Successful merges: - rust-lang#101569 (Don't re-export private/unstable ArgumentV1 from `alloc`.) - rust-lang#106106 (Pass `branch.{branch}.remote=origin` to `git submodule update`) - rust-lang#107146 (Make `unsizing_params_for_adt` into a query) - rust-lang#107264 (Add option to include private items in library docs) - rust-lang#107452 (Fix typo in `{Rc, Arc}::get_mut_unchecked` docs) - rust-lang#107459 (end entry paragraph with a period (.)) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
The
alloc::fmt::ArgumentV1re-export was marked as#[stable]even though the originalcore::fmt::ArgumentV1is#[unstable](and#[doc(hidden)]).(It wasn't usable though:
)
Part of #99012