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.

Sign up for GitHub

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

Jump to bottom

Rollup of 7 pull requests #133591

Closed
wants to merge 15 commits into from
Closed

Rollup of 7 pull requests #133591

wants to merge 15 commits into from

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Nov 28, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

aksh1618 and others added 15 commits November 25, 2024 17:37
@aksh1618
Fix typos in pin.rs
f5216ee
@longxiangqiao
chore: fix 404 status URL
807e978 
Signed-off-by: longxiangqiao <longxiangqiao@qq.com>
@timvisee
Use consistent wording in docs, use zero instead of 0
74cf503
@timvisee
Also use zero when referencing to capacity or length
89b20e9
@slanterns
fix typo in RELEASES.md
dae1bf3
@uweigand
Document s390x machine access via community cloud
ac9324c
@tbu-
Fix type (exit → exist)
8a367ec
@ehuss
Update more 2024 tests to remove -Zunstable-options
632db1f
@jhpratt
Rollup merge of rust-lang#133466 - aksh1618:patch-1, r=thomcc
902d406 
Fix typos in pin.rs
@jhpratt
Rollup merge of rust-lang#133530 - timvisee:master, r=jhpratt
7a88c7c 
Use consistent wording in docs, use is zero instead of is 0

In documentation, wording of _"`rhs` is zero"_ and _"`rhs` is 0"_ is intermixed. This is especially visible [here](https://doc.rust-lang.org/std/primitive.usize.html#method.div_ceil).

This changes all occurrences to _"`rhs` is zero"_ for better readability.
@jhpratt
Rollup merge of rust-lang#133565 - longxiangqiao:master, r=ehuss
45c345f 
chore: fix 404 status URL
@jhpratt
Rollup merge of rust-lang#133575 - slanterns:typo, r=compiler-errors
fde449f 
Fix typo in RELEASES.md

An additional dot.
@jhpratt
Rollup merge of rust-lang#133577 - uweigand:s390x-doc-cloudaccess, r=…
4707966 
…jieyouxu

Document s390x machine access via community cloud
@jhpratt
Rollup merge of rust-lang#133583 - tbu-:pr_fix_typo2, r=compiler-errors
1f9c06c 
Fix type (exit → exist)
@jhpratt
Rollup merge of rust-lang#133584 - ehuss:more-2024-unstable-options, …
eb9a3d2 
…r=compiler-errors

Update more 2024 tests to remove -Zunstable-options

This removes `-Zunsable-options` from more tests that I missed in rust-lang#133349.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 28, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Nov 28, 2024

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Nov 28, 2024

📌 Commit eb9a3d2 has been approved by jhpratt

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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 28, 2024
@bors
Copy link
Contributor

bors commented Nov 28, 2024

🔒 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 rollup-24k0ij6 (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 rollup-24k0ij6 --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 
Auto-merging tests/ui/rust-2024/unsafe-attributes/unsafe-attributes-from-pm.rs
CONFLICT (content): Merge conflict in tests/ui/rust-2024/unsafe-attributes/unsafe-attributes-from-pm.rs
Auto-merging tests/ui/proc-macro/macro_rules_edition_from_pm.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 28, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Nov 28, 2024

@bors r-

@jhpratt jhpratt closed this Nov 28, 2024
@jhpratt jhpratt deleted the rollup-24k0ij6 branch November 28, 2024 21:46
@bors
Copy link
Contributor

bors commented Nov 28, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@jhpratt @bors @rustbot @aksh1618 @longxiangqiao @timvisee @slanterns @uweigand @tbu- @ehuss