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 4 pull requests #131428

Closed
wants to merge 17 commits into from
Closed

Rollup of 4 pull requests #131428

wants to merge 17 commits into from

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 17 commits October 8, 2024 21:13
@GuillaumeGomez
Fix methods alignment on mobile
dceb9a6
@GuillaumeGomez
Add GUI regression test for methods left margin on mobile
9e041fa
@coolreader18
Stabilize Pin::as_deref_mut
5db54be
@workingjubilee
compiler: Factor rustc_target::abi::* out of middle::ty::layout
8da92b5
@workingjubilee
compiler: Factor rustc_target::abi::* out of ty_utils
11c48be
@workingjubilee
compiler: Factor rustc_target::abi out of const_eval
9d95c8b
@workingjubilee
compiler: Factor rustc_target::abi out of hir_typeck
ff17ce2
@workingjubilee
compiler: Factor rustc_target::abi out of cg_ssa
839cf1c
@workingjubilee
compiler: Factor rustc_target::abi out of cg_llvm
1379ef5
@workingjubilee
cg_clif: Factor out rustc_target::abi
b3beb4e
@workingjubilee
cg_gcc: Factor out rustc_target::abi
d92aee5
@workingjubilee
compiler: Seal off the rustc_target::abi enum glob imports
43e198a
@cuviper
Fix quotation marks around debug line in src/ci/run.sh
af5a704 
Without this change, the markdown-style backticks are treated as a shell
command substitution, which fails like so:

    /checkout/src/ci/run.sh: line 58: DISABLE_CI_RUSTC_IF_INCOMPATIBLE: command not found
    debug:  configured.
@workingjubilee
Rollup merge of rust-lang#129424 - coolreader18:stabilize-pin_as_dere…
b4d001e 
…f_mut, r=dtolnay

Stabilize `Pin::as_deref_mut()`

Tracking issue: rust-lang#86918

Stabilizing the following API:

```rust
impl<Ptr: DerefMut> Pin<Ptr> {
    pub fn as_deref_mut(self: Pin<&mut Pin<Ptr>>) -> Pin<&mut Ptr::Target>;
}
```

I know that an FCP has not been started yet, but this isn't a very complex stabilization, and I'm hoping this can motivate an FCP to *get* started - this has been pending for a while and it's a very useful function when writing Future impls.

r? `@jonhoo`
@workingjubilee
Rollup merge of rust-lang#131417 - GuillaumeGomez:mobile-methods-left…
fb79df5 
…-margin, r=notriddle

Fix methods alignment on mobile

I realized that on mobile, the methods are not aligned the same depending if they have documentation or not:

| before | after |
|-|-|
| ![Screenshot from 2024-10-08 20-40-22](https://github.com/user-attachments/assets/d31ba5e1-cf84-431f-9b2b-9962bc5a0365) | ![image](https://github.com/user-attachments/assets/ffde2161-bfcb-4462-8c5b-88538e61b366) |

r? `@notriddle`
@workingjubilee
Rollup merge of rust-lang#131424 - workingjubilee:stem-the-tyde-of-gl…
0e7d1d0 
…ob-imports, r=jieyouxu

compiler: Stop reexporting enum-globs from `rustc_target::abi`

Three enums had **all** their variants glob-exported into a distressingly large amount of the tree. Cease to do that, and also cease to glob import the contents of the module that contained them. Redirect relevant imports to their actual source, the `rustc_abi` crate.

No functional changes.
@workingjubilee
Rollup merge of rust-lang#131426 - cuviper:ci-debug-quotes, r=jieyouxu
887b73c 
Fix quotation marks around debug line in `src/ci/run.sh`

Without this change, the markdown-style backticks are treated as a shell
command substitution, which fails like so:

    /checkout/src/ci/run.sh: line 58: DISABLE_CI_RUSTC_IF_INCOMPATIBLE: command not found
    debug:  configured.

r? onur-ozkan
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 9, 2024
@workingjubilee
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Oct 9, 2024

📌 Commit 887b73c has been approved by workingjubilee

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 Oct 9, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 9, 2024
@bors
Auto merge of rust-lang#131428 - workingjubilee:rollup-1qjc2db, r=wor…
e266509 
…kingjubilee

Rollup of 4 pull requests

Successful merges:

 - rust-lang#129424 (Stabilize `Pin::as_deref_mut()`)
 - rust-lang#131417 (Fix methods alignment on mobile)
 - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`)
 - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Oct 9, 2024

⌛ Testing commit 887b73c with merge e266509...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
##[group]Building stage1 library artifacts (x86_64-unknown-linux-gnu)
##[endgroup]
##[group]Building tool rustdoc (stage0 -> stage1, x86_64-unknown-linux-gnu)
##[endgroup]
thread 'core::builder::tests::ci_rustc_if_unchanged_logic' panicked at src/core/builder/tests.rs:260:5:
assertion failed: has_changes == config.download_rustc_commit.is_none()
   0: rust_begin_unwind
             at /rustc/8c27a2ba6b21f3406a51118643080f0591949827/library/std/src/panicking.rs:662:5
   1: core::panicking::panic_fmt
             at /rustc/8c27a2ba6b21f3406a51118643080f0591949827/library/core/src/panicking.rs:74:14

@bors
Copy link
Contributor

bors commented Oct 9, 2024

💔 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 Oct 9, 2024
@workingjubilee
Copy link
Member Author

hypothetically good to go after #131434

so
@bors retry

@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 Oct 9, 2024
@bors
Copy link
Contributor

bors commented Oct 9, 2024

⌛ Testing commit 887b73c with merge abca7c1...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 9, 2024
@bors
Auto merge of rust-lang#131428 - workingjubilee:rollup-1qjc2db, r=wor…
abca7c1 
…kingjubilee

Rollup of 4 pull requests

Successful merges:

 - rust-lang#129424 (Stabilize `Pin::as_deref_mut()`)
 - rust-lang#131417 (Fix methods alignment on mobile)
 - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`)
 - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`)

r? `@ghost`
`@rustbot` modify labels: rollup
@onur-ozkan onur-ozkan mentioned this pull request Oct 9, 2024
Merged
@onur-ozkan
Copy link
Member

hypothetically good to go after #131434

so @bors retry

Don't we need to rebase this PR before trying again?

@jieyouxu
Copy link
Member

jieyouxu commented Oct 9, 2024

I think we only need to rebase if there are conflicting choices, but not sure

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
##[group]Building stage1 library artifacts (x86_64-unknown-linux-gnu)
##[endgroup]
##[group]Building tool rustdoc (stage0 -> stage1, x86_64-unknown-linux-gnu)
##[endgroup]
thread 'core::builder::tests::ci_rustc_if_unchanged_logic' panicked at src/core/builder/tests.rs:260:5:
assertion failed: has_changes == config.download_rustc_commit.is_none()
   0: rust_begin_unwind
             at /rustc/8c27a2ba6b21f3406a51118643080f0591949827/library/std/src/panicking.rs:662:5
   1: core::panicking::panic_fmt
             at /rustc/8c27a2ba6b21f3406a51118643080f0591949827/library/core/src/panicking.rs:74:14

@bors
Copy link
Contributor

bors commented Oct 9, 2024

💔 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 Oct 9, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Oct 9, 2024

Guess we do then

@jieyouxu
Copy link
Member

jieyouxu commented Oct 9, 2024

Going to try open a new rollup

@jieyouxu jieyouxu closed this Oct 9, 2024
@workingjubilee workingjubilee deleted the rollup-1qjc2db branch October 9, 2024 16:44
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
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup 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-infra Relevant to the infrastructure 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-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.
9 participants
@workingjubilee @bors @rust-log-analyzer @onur-ozkan @jieyouxu @rustbot @GuillaumeGomez @coolreader18 @cuviper