Delegate to inner vec::IntoIter from env::ArgsOs
#139847
Open
+207
−21
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustbot has assigned @workingjubilee. Use |
rustbot
added
S-waiting-on-review
thaliaarchi
force-pushed
the
args/delegate-iter
branch
2 times, most recently
from
3a60980 to
b63849b
Compare
thaliaarchi
added a commit
to thaliaarchi/rust
that referenced
this pull request
Apr 15, 2025
The zkVM implementation of `env::ArgsOs` reports the full length even after having iterated once, which is incorrect. Instead, use a double cursor approach which works out to be simpler. Also, implement more iterator methods like the other platforms in rust-lang#139847.
thaliaarchi
added a commit
to thaliaarchi/rust
that referenced
this pull request
Apr 15, 2025
The zkVM implementation of `env::ArgsOs` incorrectly reports the full length even after having iterated. Instead, use a range approach which works out to be simpler. Also, implement more iterator methods like the other platforms in rust-lang#139847.
thaliaarchi
added a commit
to thaliaarchi/rust
that referenced
this pull request
Apr 15, 2025
The zkVM implementation of `env::ArgsOs` incorrectly reports the full length even after having iterated. Instead, use a range approach which works out to be simpler. Also, implement more iterator methods like the other platforms in rust-lang#139847.
thaliaarchi
force-pushed
the
args/delegate-iter
branch
from
b63849b to
13e6873
Compare
|
☔ The latest upstream changes (presumably #140282) made this pull request unmergeable. Please resolve the merge conflicts. |
uhhh. hm. I am slightly confused as to how to read the pull request's description, as my first attempt to understand it leads to deriving "the changes in this PR cannot benefit |
|
the code seems cromulent besides that, but I'll take a closer look with an explanation for what I should be looking for, because I feel like I missed a beat (lose the rhythm, and nothing falls into place! only missed by a fraction, slipped a little off your pace! oh!) @rustbot author |
rustbot
added
S-waiting-on-author
|
Reminder, once the PR becomes ready for a review, use |
|
ah, the concern is with a third type! thank you, that is much clearer. |
thaliaarchi
force-pushed
the
args/delegate-iter
branch
2 times, most recently
from
90b027d to
ac00d49
Compare
|
I've rebased to resolve merge conflicts and touched up a comment, separately, so it's sane to compare with this terrible UI. |
workingjubilee
approved these changes
May 1, 2025
thaliaarchi
force-pushed
the
args/delegate-iter
branch
from
ac00d49 to
def3a30
Compare
Delegate from `std::env::ArgsOs` to the methods of the inner platform-specific iterators, when it would be more efficient than just using the default methods of its own impl. Most platforms use `vec::IntoIter` as the inner type, so prioritize delegating to the methods it provides. `std::env::Args` is implemented atop `std::env::ArgsOs` and performs UTF-8 validation with a panic for invalid data. This is a visible effect which users certainly rely on, so we can't skip any arguments. Any further iterator methods would skip some elements, so no change is needed for that type. Add `#[inline]` for any methods which simply wrap the inner iterator.
thaliaarchi
force-pushed
the
args/delegate-iter
branch
from
def3a30 to
28deaa6
Compare
|
Thanks! @bors r+ |
bors
removed
the
S-waiting-on-author
bors
added
the
S-waiting-on-bors
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
May 2, 2025
…workingjubilee Delegate to inner `vec::IntoIter` from `env::ArgsOs` Delegate from `std::env::ArgsOs` to the methods of the inner platform-specific iterators, when it would be more efficient than just using the default methods of its own impl. Most platforms use `vec::IntoIter` as the inner type, so prioritize delegating to the methods it provides. `std::env::Args` is implemented atop `std::env::ArgsOs` and performs UTF-8 validation with a panic for invalid data. This is a visible effect which users certainly rely on, so we can't skip any arguments. Any further iterator methods would skip some elements, so no change is needed for that type. Add `#[inline]` for any methods which simply wrap the inner iterator.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 2, 2025
Rollup of 12 pull requests Successful merges: - rust-lang#134034 (handle paren in macro expand for let-init-else expr) - rust-lang#137474 (pretty-print: Print shebang at the top of the output) - rust-lang#138872 (rustc_target: RISC-V `Zfinx` is incompatible with `{ILP32,LP64}[FD]` ABIs) - rust-lang#139046 (Improve `Lifetime::suggestion`) - rust-lang#139206 (std: use the address of `errno` to identify threads in `unique_thread_exit`) - rust-lang#139608 (Clarify `async` block behaviour) - rust-lang#139847 (Delegate to inner `vec::IntoIter` from `env::ArgsOs`) - rust-lang#140159 (Avoid redundant WTF-8 checks in `PathBuf`) - rust-lang#140197 (Document breaking out of a named code block) - rust-lang#140389 (Remove `avx512dq` and `avx512vl` implication for `avx512fp16`) - rust-lang#140430 (Improve test coverage of HIR pretty printing.) - rust-lang#140507 (rustc_target: RISC-V: feature addition batch 3) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Delegate from
std::env::ArgsOsto the methods of the inner platform-specific iterators, when it would be more efficient than just using the default methods of its own impl. Most platforms usevec::IntoIteras the inner type, so prioritize delegating to the methods it provides.std::env::Argsis implemented atopstd::env::ArgsOsand performs UTF-8 validation with a panic for invalid data. This is a visible effect which users certainly rely on, so we can't skip any arguments. Any further iterator methods would skip some elements, so no change is needed for that type.Add
#[inline]for any methods which simply wrap the inner iterator.