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

Use verbatim paths for process::Command if necessary #92519

Merged
merged 2 commits into from
Mar 19, 2022
Merged

Use verbatim paths for process::Command if necessary #92519

merged 2 commits into from
Mar 19, 2022

Conversation

ChrisDenton
Copy link
Member

In #89174, the standard library started using verbatim paths so longer paths are usable by default. However, Command was originally left out because of the way CreateProcessW was being called. This was changed as a side effect of #87704 so now Command paths can be converted to verbatim too (if necessary).

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2022
@bors
Copy link
Contributor

bors commented Jan 5, 2022

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

@ChrisDenton ChrisDenton force-pushed the command-maybe-verbatim branch from c95249c to 2bfd6f8 Compare January 5, 2022 17:08
@joshtriplett joshtriplett added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Jan 9, 2022
@joshtriplett
Copy link
Member

Seems reasonable to me.

@rfcbot merge

@rfcbot
Copy link

rfcbot commented Jan 9, 2022 •
edited by Amanieu
Loading

Team member @joshtriplett has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rfcbot rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Jan 9, 2022
@rfcbot
Copy link

rfcbot commented Jan 12, 2022

🔔 This is now entering its final comment period, as per the review above. 🔔

@rfcbot rfcbot removed the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Jan 12, 2022
@rfcbot rfcbot added the finished-final-comment-period The final comment period is finished for this PR / Issue. label Jan 22, 2022
@rfcbot
Copy link

rfcbot commented Jan 22, 2022

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

@rfcbot rfcbot added to-announce Announce this issue on triage meeting and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Jan 22, 2022
@apiraino apiraino removed the to-announce Announce this issue on triage meeting label Feb 1, 2022
@ChrisDenton
Copy link
Member Author

@joshtriplett this can be merged now?

@ChrisDenton ChrisDenton force-pushed the command-maybe-verbatim branch from 2bfd6f8 to 93f627d Compare February 17, 2022 13:21
@ChrisDenton
Copy link
Member Author

ChrisDenton commented Feb 17, 2022 •
edited
Loading

Rebased after #91182 was merged (which didn't cause a merge conflict but does break this PR). The first commit is the same as before. The second fixes program_exists to use maybe_verbatim and the resolver to reuse the UTF-16 encoded path rather than having to re-encode it again. That last bit isn't strictly necessary here and could be a separate PR if it would be easier.

@dtolnay dtolnay assigned dtolnay and unassigned joshtriplett Mar 18, 2022
dtolnay
dtolnay approved these changes Mar 18, 2022
View reviewed changes
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

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

Thanks!

@dtolnay
Copy link
Member

dtolnay commented Mar 18, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Mar 18, 2022

📌 Commit 93f627d has been approved by dtolnay

@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 Mar 18, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 19, 2022
@Dylan-DPC
Rollup merge of rust-lang#92519 - ChrisDenton:command-maybe-verbatim,…
52061cd 
… r=dtolnay

Use verbatim paths for `process::Command` if necessary

In rust-lang#89174, the standard library started using verbatim paths so longer paths are usable by default. However, `Command` was originally left out because of the way `CreateProcessW` was being called. This was changed as a side effect of rust-lang#87704 so now `Command` paths can be converted to verbatim too (if necessary).
This was referenced Mar 19, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 19, 2022
@bors
Auto merge of rust-lang#95101 - Dylan-DPC:rollup-r1f1v9t, r=Dylan-DPC
3153584 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#92519 (Use verbatim paths for `process::Command` if necessary)
 - rust-lang#92612 (Update stdlib for the l4re target)
 - rust-lang#92663 (Implement `Write for Cursor<[u8; N]>`, plus `A: Allocator` cursor support)
 - rust-lang#93263 (Consistently present absent stdio handles on Windows as NULL handles.)
 - rust-lang#93692 (keyword_docs: document use of `in` with `pub` keyword)
 - rust-lang#94984 (add `CStr` method that accepts any slice containing a nul-terminated string)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ba2d5ed into rust-lang:master Mar 19, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 19, 2022
@dtolnay dtolnay added the O-windows Operating system: Windows label Mar 20, 2022
@dtolnay dtolnay mentioned this pull request Mar 20, 2022
Merged
messense added a commit to rust-cross/cargo-zigbuild that referenced this pull request Mar 20, 2022
@messense
Fix Windows nightly error caused by rust-lang/rust#92519
ce6ff22
messense added a commit to rust-cross/cargo-zigbuild that referenced this pull request Mar 20, 2022
@messense
Merge pull request #17 from messense/fix-windows-nightly
e9bdf52 
Fix Windows nightly error caused by rust-lang/rust#92519
@ChrisDenton ChrisDenton deleted the command-maybe-verbatim branch April 28, 2022 20:25
ChrisDenton added a commit to ChrisDenton/rust that referenced this pull request Apr 29, 2022
@ChrisDenton
Revert "Rollup merge of rust-lang#92519 - ChrisDenton:command-maybe-v…
7ae2017 
…erbatim, r=dtolnay"

This reverts commit ba2d5ed, reversing
changes made to 9b701e7.
@ChrisDenton ChrisDenton mentioned this pull request Apr 29, 2022
Closed
Mark-Simulacrum pushed a commit to Mark-Simulacrum/rust that referenced this pull request May 13, 2022
@ChrisDenton @Mark-Simulacrum
Revert "Rollup merge of rust-lang#92519 - ChrisDenton:command-maybe-v…
2a5c4e9 
…erbatim, r=dtolnay"

This reverts commit ba2d5ed, reversing
changes made to 9b701e7.
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request May 13, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2022
@bors
Auto merge of rust-lang#97014 - Mark-Simulacrum:beta-next, r=Mark-Sim…
eb1e588 
…ulacrum

[beta] backports

This backports/rolls up:

*  Quick fix for rust-lang#96223. rust-lang#96679
*  [beta] Revert rust-lang#92519 on beta rust-lang#96556
*  [beta] Clippy backport ICE/infinite loop fix rust-lang#96740
*  Revert "Prefer projection candidates instead of param_env candidates for Sized predicates" rust-lang#96593
MabezDev pushed a commit to esp-rs/rust that referenced this pull request May 17, 2022
@ChrisDenton @MabezDev
Revert "Rollup merge of rust-lang#92519 - ChrisDenton:command-maybe-v…
e097602 
…erbatim, r=dtolnay"

This reverts commit ba2d5ed, reversing
changes made to 9b701e7.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. 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-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.
8 participants
@ChrisDenton @rust-highfive @bors @joshtriplett @rfcbot @dtolnay @apiraino @rustbot