From b9ae04f088803d1df2b704aa5a3f5392ddf53cf6 Mon Sep 17 00:00:00 2001 From: Abhishek Sudhakaran Date: Sun, 12 Dec 2021 03:31:40 +0530 Subject: [PATCH] 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()`. --- src/bootstrap/dist.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 5f28ffeda8fee..dd179df394889 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");