Merge pull request #401 from ebarnard/windows-min-ci

Run the `Minimum Rust` CI job on Windows and fix it on Linux

azure-pipelines.yml

@@ -2,12 +2,24 @@ trigger:
   - master
 
 jobs:
-  - job: min
-    displayName: Minimum Rust
+  - job: min_linux
+    pool:
+      vmImage: ubuntu-16.04
+    displayName: Minimum Rust (Linux)
+    variables:
+      TOOLCHAIN: 1.16.0
+    steps:
+      - template: ci/azure-install-rust.yml
+      - script: cargo build
+
+  - job: min_Windows
+    pool:
+      vmImage: vs2017-win2016
+    displayName: Minimum Rust (Windows)
+    variables:
+      TOOLCHAIN: 1.16.0
     steps:
       - template: ci/azure-install-rust.yml
-        parameters:
-          toolchain: 1.16.0
       - script: cargo build
 
   - job: Linux

ci/azure-install-rust.yml

@@ -11,8 +11,9 @@ steps:
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
 
   - script: |
+      IF "%TOOLCHAIN%"=="" (SET TOOLCHAIN=stable-%TARGET%)
       curl -sSf -o rustup-init.exe https://win.rustup.rs
-      rustup-init.exe -y --default-toolchain stable-%TARGET%
+      rustup-init.exe -y --default-toolchain %TOOLCHAIN%
       echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
     displayName: Install rust (windows)
     condition: eq( variables['Agent.OS'], 'Windows_NT' )

src/lib.rs

@@ -2401,7 +2401,7 @@ fn spawn(cmd: &mut Command, program: &str) -> Result<(Child, JoinHandle<()>), Er
 }
 
 fn fail(s: &str) -> ! {
-    eprintln!("\n\nerror occurred: {}\n\n", s);
+    let _ = writeln!(io::stderr(), "\n\nerror occurred: {}\n\n", s);
     std::process::exit(1);
 }
 

src/windows_registry.rs

@@ -225,10 +225,10 @@ mod impl_ {
             return Box::new(iter::empty());
         };
         Box::new(instances.filter_map(|instance| {
-            let instance = instance.ok()?;
-            let installation_name = instance.installation_name().ok()?;
-            if installation_name.to_str()?.starts_with("VisualStudio/16.") {
-                Some(PathBuf::from(instance.installation_path().ok()?))
+            let instance = otry!(instance.ok());
+            let installation_name = otry!(instance.installation_name().ok());
+            if otry!(installation_name.to_str()).starts_with("VisualStudio/16.") {
+                Some(PathBuf::from(otry!(instance.installation_path().ok())))
             } else {
                 None
             }
@@ -236,7 +236,7 @@ mod impl_ {
     }
 
     fn find_tool_in_vs16_path(tool: &str, target: &str) -> Option<Tool> {
-        vs16_instances().find_map(|path| {
+        vs16_instances().filter_map(|path| {
             let path = path.join(tool);
             if !path.is_file() {
                 return None;
@@ -246,7 +246,7 @@ mod impl_ {
                 tool.env.push(("Platform".into(), "X64".into()));
             }
             Some(tool)
-        })
+        }).next()
     }
 
     fn find_msbuild_vs16(target: &str) -> Option<Tool> {
@@ -307,7 +307,7 @@ mod impl_ {
                 .ok()
                 .and_then(|key| key.query_str("15.0").ok())
                 .map(|path| PathBuf::from(path).join(tool))
-                .filter(|ref path| path.is_file());
+                .and_then(|path| if path.is_file() { Some(path) } else { None });
         }
 
         path.map(|path| {
@@ -681,7 +681,7 @@ mod impl_ {
         for subkey in key.iter().filter_map(|k| k.ok()) {
             let val = subkey
                 .to_str()
-                .and_then(|s| s.trim_start_matches("v").replace(".", "").parse().ok());
+                .and_then(|s| s.trim_left_matches("v").replace(".", "").parse().ok());
             let val = match val {
                 Some(s) => s,
                 None => continue,