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

Don't re-export private/unstable ArgumentV1 from alloc. #101569

Merged
merged 2 commits into from
Jan 30, 2023

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Sep 8, 2022

The alloc::fmt::ArgumentV1 re-export was marked as #[stable] even though the original core::fmt::ArgumentV1 is #[unstable] (and #[doc(hidden)]).

(It wasn't usable though:

error[E0658]: use of unstable library feature 'fmt_internals': internal to format_args!
 --> src/main.rs:4:12
  |
4 |     let _: alloc::fmt::ArgumentV1 = todo!();
  |            ^^^^^^^^^^^^^^^^^^^^^^
  |
  = help: add `#![feature(fmt_internals)]` to the crate attributes to enable

)

Part of #99012

@m-ou-se m-ou-se added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Sep 8, 2022
@rustbot

This comment was marked as outdated.

@rust-highfive
Copy link
Collaborator

r? @thomcc

(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 Sep 8, 2022
@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@thomcc thomcc left a comment

Choose a reason for hiding this comment

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

Looks good, r=me once CI passes (looks like it either needs reformatting or a tidy bless)

@thomcc thomcc 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 Sep 11, 2022
@m-ou-se m-ou-se force-pushed the alloc-no-rexport-argumentv1 branch from 94a1b6b to fdc6d1a Compare November 28, 2022 19:25
@Dylan-DPC
Copy link
Member

@bors r=thomcc

@bors
Copy link
Contributor

bors commented Dec 11, 2022

📌 Commit fdc6d1ade8a137e11a4de603a29de238964bbdcf has been approved by thomcc

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 11, 2022
@bors
Copy link
Contributor

bors commented Dec 11, 2022

⌛ Testing commit fdc6d1ade8a137e11a4de603a29de238964bbdcf with merge dad3e742eec65f900b36f21e3951760858bbd1de...

@bors
Copy link
Contributor

bors commented Dec 11, 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 Dec 11, 2022
@thomcc
Copy link
Member

thomcc commented Dec 12, 2022

@rustbot author

@rustbot rustbot 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 Dec 12, 2022
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Dec 14, 2022

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

@bors
Copy link
Contributor

bors commented Jan 16, 2023

🔒 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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout alloc-no-rexport-argumentv1 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self alloc-no-rexport-argumentv1 --force-with-lease (update this PR)

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 git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
CONFLICT (modify/delete): src/test/ui/fmt/ifmt-unimpl.stderr deleted in HEAD and modified in heads/homu-tmp. Version heads/homu-tmp of src/test/ui/fmt/ifmt-unimpl.stderr left in tree.
Auto-merging library/alloc/src/fmt.rs
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 27552 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

@m-ou-se m-ou-se force-pushed the alloc-no-rexport-argumentv1 branch from fdc6d1a to 47adb65 Compare January 29, 2023 19:20
@m-ou-se
Copy link
Member Author

m-ou-se commented Jan 30, 2023

@bors r=thomcc

@bors
Copy link
Contributor

bors commented Jan 30, 2023

📌 Commit 47adb65 has been approved by thomcc

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 30, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2023
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
@bors bors merged commit 28340ba into rust-lang:master Jan 30, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 30, 2023
@m-ou-se m-ou-se deleted the alloc-no-rexport-argumentv1 branch January 30, 2023 14:05
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. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants