Skip to content

Conversation

workingjubilee
Copy link
Member

@workingjubilee workingjubilee commented Feb 21, 2025

In #137324 I approved the change of the i586-pc-qnx platform to i686 with this extra line included. I noticed it but thought it was a bootstrap problem of some sort. Nonetheless, removing this line doesn't seem to change anything.

r? @Noratrieb

@rustbot rustbot added A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 21, 2025
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 21, 2025

📌 Commit 2f29c2e has been approved by jieyouxu

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 Feb 21, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2025
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#132876 (rustdoc book: acknowledge --document-hidden-items)
 - rust-lang#136148 (Optionally add type names to `TypeId`s.)
 - rust-lang#136609 (libcore/net: `IpAddr::as_octets()`)
 - rust-lang#137336 (Stabilise `os_str_display`)
 - rust-lang#137350 (Move methods from Map to TyCtxt, part 3.)
 - rust-lang#137353 (Implement `read_buf` for WASI stdin)
 - rust-lang#137361 (Refactor `OperandRef::extract_field` to prep for MCP838)
 - rust-lang#137367 (Do not exempt nonexistent platforms from platform policy)
 - rust-lang#137374 (Stacker now handles miri using a noop impl itself)
 - rust-lang#137392 (remove few unused fields)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0f56361 into rust-lang:master Feb 21, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 21, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2025
Rollup merge of rust-lang#137367 - workingjubilee:remove-stray-line, r=jieyouxu

Do not exempt nonexistent platforms from platform policy

In rust-lang#137324 I approved the change of the i586-pc-qnx platform to i686 with this extra line included. I noticed it but thought it was a bootstrap problem of some sort. Nonetheless, removing this line doesn't seem to change anything.

r? `@Noratrieb`
@workingjubilee workingjubilee deleted the remove-stray-line branch February 21, 2025 23:24
flip1995 pushed a commit to flip1995/rust that referenced this pull request Feb 27, 2025
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#132876 (rustdoc book: acknowledge --document-hidden-items)
 - rust-lang#136148 (Optionally add type names to `TypeId`s.)
 - rust-lang#136609 (libcore/net: `IpAddr::as_octets()`)
 - rust-lang#137336 (Stabilise `os_str_display`)
 - rust-lang#137350 (Move methods from Map to TyCtxt, part 3.)
 - rust-lang#137353 (Implement `read_buf` for WASI stdin)
 - rust-lang#137361 (Refactor `OperandRef::extract_field` to prep for MCP838)
 - rust-lang#137367 (Do not exempt nonexistent platforms from platform policy)
 - rust-lang#137374 (Stacker now handles miri using a noop impl itself)
 - rust-lang#137392 (remove few unused fields)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#132876 (rustdoc book: acknowledge --document-hidden-items)
 - rust-lang#136148 (Optionally add type names to `TypeId`s.)
 - rust-lang#136609 (libcore/net: `IpAddr::as_octets()`)
 - rust-lang#137336 (Stabilise `os_str_display`)
 - rust-lang#137350 (Move methods from Map to TyCtxt, part 3.)
 - rust-lang#137353 (Implement `read_buf` for WASI stdin)
 - rust-lang#137361 (Refactor `OperandRef::extract_field` to prep for MCP838)
 - rust-lang#137367 (Do not exempt nonexistent platforms from platform policy)
 - rust-lang#137374 (Stacker now handles miri using a noop impl itself)
 - rust-lang#137392 (remove few unused fields)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#132876 (rustdoc book: acknowledge --document-hidden-items)
 - rust-lang#136148 (Optionally add type names to `TypeId`s.)
 - rust-lang#136609 (libcore/net: `IpAddr::as_octets()`)
 - rust-lang#137336 (Stabilise `os_str_display`)
 - rust-lang#137350 (Move methods from Map to TyCtxt, part 3.)
 - rust-lang#137353 (Implement `read_buf` for WASI stdin)
 - rust-lang#137361 (Refactor `OperandRef::extract_field` to prep for MCP838)
 - rust-lang#137367 (Do not exempt nonexistent platforms from platform policy)
 - rust-lang#137374 (Stacker now handles miri using a noop impl itself)
 - rust-lang#137392 (remove few unused fields)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tidy Area: The tidy tool S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants