Skip to content

Move args into std::sys#139710

Merged
bors merged 3 commits intorust-lang:masterfrom
thaliaarchi:move-args-pal
Apr 13, 2025
Merged

Move args into std::sys#139710
bors merged 3 commits intorust-lang:masterfrom
thaliaarchi:move-args-pal

Conversation

@thaliaarchi
Copy link
Contributor

@thaliaarchi thaliaarchi commented Apr 12, 2025

Move platform definitions of args into std::sys, as part of #117276.

cc @joboet

@rustbot
Copy link
Collaborator

rustbot commented Apr 12, 2025

r? @ibraheemdev

rustbot has assigned @ibraheemdev.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 12, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@thaliaarchi thaliaarchi mentioned this pull request Apr 12, 2025
Merged
@joboet
Copy link
Member

joboet commented Apr 12, 2025

Thank you!
@bors r+

@bors
Copy link
Collaborator

bors commented Apr 12, 2025

📌 Commit 5305773 has been approved by joboet

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 Apr 12, 2025
@joboet joboet assigned joboet and unassigned ibraheemdev Apr 12, 2025
@thaliaarchi
Copy link
Contributor Author

thaliaarchi commented Apr 12, 2025

Sorry I found another simplification while you were reviewing and pushed it!

@joboet
Copy link
Member

joboet commented Apr 12, 2025

@bors r-

@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 Apr 12, 2025
joboet
joboet reviewed Apr 12, 2025
View reviewed changes
library/std/src/sys/args/mod.rs Outdated
Comment on lines 5 to 6
#[allow(dead_code)]
mod common;
Copy link
Member

@joboet joboet Apr 12, 2025

Choose a reason for hiding this comment

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

I'm not a big fan of an unconditional #[allow(dead_code)]. Could you perhaps move the module definition to the individual platforms, or alternatively use cfg_attr to enable the lint on at least one platform (preferably Linux)?

Copy link
Contributor Author

@thaliaarchi thaliaarchi Apr 12, 2025

Choose a reason for hiding this comment

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

I now included common by path in each of the platform modules. How's that?

Copy link
Member

@joboet joboet Apr 12, 2025

Choose a reason for hiding this comment

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

#[path]-based imports have a predisposition to break, but I think it's fine in this case.

@thaliaarchi thaliaarchi changed the title Move args into syd::sys Move args into std::sys Apr 12, 2025
@joboet
Copy link
Member

joboet commented Apr 12, 2025

r=me once CI is green

@bors delegate+

@bors
Copy link
Collaborator

bors commented Apr 12, 2025

✌️ @thaliaarchi, you can now approve this pull request!

If @joboet told you to "r=me" after making some further change, please make that change, then do @bors r=@joboet

@thaliaarchi
Copy link
Contributor Author

thaliaarchi commented Apr 12, 2025

@bors r=joboet

@bors
Copy link
Collaborator

bors commented Apr 12, 2025

📌 Commit bea2022 has been approved by joboet

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 Apr 12, 2025
ChrisDenton added a commit to ChrisDenton/rust that referenced this pull request Apr 13, 2025
@ChrisDenton
Rollup merge of rust-lang#139710 - thaliaarchi:move-args-pal, r=joboet
a0a2ec3 
Move `args` into `std::sys`

Move platform definitions of `args` into `std::sys`, as part of rust-lang#117276.

cc `@joboet`
@ChrisDenton ChrisDenton mentioned this pull request Apr 13, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2025
@bors
Auto merge of rust-lang#139742 - ChrisDenton:rollup-rd0vj53, r=ChrisD…
aafb7ce 
…enton

Rollup of 11 pull requests

Successful merges:

 - rust-lang#138972 (std: Fix build for NuttX targets)
 - rust-lang#139177 (Use -C target-cpu=z13 on s390x vector test)
 - rust-lang#139511 (libtest: Pass the test's panic payload as Option instead of Result)
 - rust-lang#139605 (update ```miniz_oxide``` to 0.8.8)
 - rust-lang#139618 (compiletest: Make `SUGGESTION` annotations viral)
 - rust-lang#139677 (Fix profiler_builtins build script to handle full path to profiler lib)
 - rust-lang#139683 (Use `with_native_path` for Windows)
 - rust-lang#139695 (compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout)
 - rust-lang#139710 (Move `args` into `std::sys`)
 - rust-lang#139721 (End all lines in src/stage0 with trailing newline)
 - rust-lang#139726 (Move `select_unpredictable` to the `hint` module)

r? `@ghost`
`@rustbot` modify labels: rollup
@ChrisDenton ChrisDenton mentioned this pull request Apr 13, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2025
@bors
Auto merge of rust-lang#139746 - ChrisDenton:rollup-eq08b2e, r=ChrisD…
092a284 
…enton

Rollup of 10 pull requests

Successful merges:

 - rust-lang#138972 (std: Fix build for NuttX targets)
 - rust-lang#139177 (Use -C target-cpu=z13 on s390x vector test)
 - rust-lang#139511 (libtest: Pass the test's panic payload as Option instead of Result)
 - rust-lang#139605 (update ```miniz_oxide``` to 0.8.8)
 - rust-lang#139618 (compiletest: Make `SUGGESTION` annotations viral)
 - rust-lang#139677 (Fix profiler_builtins build script to handle full path to profiler lib)
 - rust-lang#139683 (Use `with_native_path` for Windows)
 - rust-lang#139710 (Move `args` into `std::sys`)
 - rust-lang#139721 (End all lines in src/stage0 with trailing newline)
 - rust-lang#139726 (Move `select_unpredictable` to the `hint` module)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit daed9e2 into rust-lang:master Apr 13, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 13, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2025
@rust-timer
Unrolled build for rust-lang#139710
1e7ca50 
Rollup merge of rust-lang#139710 - thaliaarchi:move-args-pal, r=joboet

Move `args` into `std::sys`

Move platform definitions of `args` into `std::sys`, as part of rust-lang#117276.

cc ``@joboet``
@thaliaarchi thaliaarchi deleted the move-args-pal branch April 13, 2025 21:26
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Apr 19, 2025
@ChrisDenton
Rollup merge of rust-lang#139710 - thaliaarchi:move-args-pal, r=joboet
50f5112 
Move `args` into `std::sys`

Move platform definitions of `args` into `std::sys`, as part of rust-lang#117276.

cc ``@joboet``
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Apr 19, 2025
@bors
Auto merge of rust-lang#139746 - ChrisDenton:rollup-eq08b2e, r=ChrisD…
d84a83b 
…enton

Rollup of 10 pull requests

Successful merges:

 - rust-lang#138972 (std: Fix build for NuttX targets)
 - rust-lang#139177 (Use -C target-cpu=z13 on s390x vector test)
 - rust-lang#139511 (libtest: Pass the test's panic payload as Option instead of Result)
 - rust-lang#139605 (update ```miniz_oxide``` to 0.8.8)
 - rust-lang#139618 (compiletest: Make `SUGGESTION` annotations viral)
 - rust-lang#139677 (Fix profiler_builtins build script to handle full path to profiler lib)
 - rust-lang#139683 (Use `with_native_path` for Windows)
 - rust-lang#139710 (Move `args` into `std::sys`)
 - rust-lang#139721 (End all lines in src/stage0 with trailing newline)
 - rust-lang#139726 (Move `select_unpredictable` to the `hint` module)

r? `@ghost`
`@rustbot` modify labels: rollup
@thaliaarchi thaliaarchi mentioned this pull request Apr 22, 2025
Open
30 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joboet joboet joboet left review comments

Assignees

@joboet joboet

Labels

O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.88.0

Development

Successfully merging this pull request may close these issues.

6 participants

@thaliaarchi @rustbot @rust-log-analyzer @joboet @bors @ibraheemdev