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.

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

bootstrap: Change unwrap() to expect() for WIX path #91811

Merged
merged 1 commit into from
Dec 12, 2021

Conversation

itzurabhi
Copy link
Contributor

On Windows, x.py dist command panics without proper error message if WIX environment variable is not set. This patch changes Option::unwrap() to Option::expect().

On Windows, `x.py dist` command panics without proper error message if 'WIX' environment variable is not set. This patch changes `Option::unwrap()` to `Option::expect()`.
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 11, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 11, 2021

📌 Commit b9ae04f has been approved by Mark-Simulacrum

@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 Dec 11, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2021
…askrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#91746 (Btree: assert more API compatibility)
 - rust-lang#91748 (rustdoc: Add regression test for Iterator as notable trait on &mut T)
 - rust-lang#91811 (bootstrap: Change unwrap() to expect() for WIX path)
 - rust-lang#91814 (doc: fix typo in comments)
 - rust-lang#91815 (better span for unexpected normalization failure in CTFE engine)
 - rust-lang#91817 (rustbot: Add autolabeling for `T-rustdoc`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit be20570 into rust-lang:master Dec 12, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants