diff options
| author | Abhishek Sudhakaran <itzurabhi@gmail.com> | 2021-12-12 03:31:40 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 03:31:40 +0530 |
| commit | b9ae04f088803d1df2b704aa5a3f5392ddf53cf6 (patch) | |
| tree | debe2a5892517afe3e7438317bb0277d9ed1de65 /src | |
| parent | b8dc6aa673317cf72a8abb9c421f573f2b34b47a (diff) | |
| download | rust-b9ae04f088803d1df2b704aa5a3f5392ddf53cf6.tar.gz rust-b9ae04f088803d1df2b704aa5a3f5392ddf53cf6.zip | |
bootstrap: Change `unwrap()` to `expect()` for `WIX` path
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()`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/dist.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 5f28ffeda8f..dd179df3948 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1564,7 +1564,9 @@ impl Step for Extended { builder.install(&etc.join("gfx/rust-logo.ico"), &exe, 0o644); // Generate msi installer - let wix = PathBuf::from(env::var_os("WIX").unwrap()); + let wix_path = env::var_os("WIX") + .expect("`WIX` environment variable must be set for generating MSI installer(s)."); + let wix = PathBuf::from(wix_path); let heat = wix.join("bin/heat.exe"); let candle = wix.join("bin/candle.exe"); let light = wix.join("bin/light.exe"); |
