Make MSVC detection ludicrously robust

[retep998]

Resurrection of #31158

r? @alexcrichton

[alexcrichton]

Perhaps this could just be:

match (arch, host_arch()) {
    // ... 
}

Can you also add docs as to what's being returned here? It's not clear to me at least what these are vectors of nor what each element of the pair is.

[retep998]

Updated bin_subdir and the comments for it.

Also added a commit with one function converted to use otry!. Can you tell me what you think and whether I should apply that style to the rest of the functions?

[alexcrichton]

Yeah the logic has gotten complicated enough in a few places that I'd be fine using that macro for most of the functions, other than that looks good to me!

[retep998]

I've converted what I could to using the macro.

[kennytm]

This macro has been written at least twice in librustc under different names 😆

• try_opt!:

  rust/src/librustc/dep_graph/dep_node.rs

  Lines 13 to 20 in 382ab92

  	macro_rules! try_opt {
  	($e:expr) => (
  	match $e {
  	Some(r) => r,
  	None => return None,
  	}
  	)
  	}

• option_try!:

  rust/src/librustc/util/common.rs

  Lines 72 to 74 in bb4b3fb

  	macro_rules! option_try(
  	($e:expr) => (match $e { Some(e) => e, None => return None })
  	);

[retep998]

Clearly this just indicates the need for this sort of macro in libstd. Sure would be nice if the new ? stuff supported Option.

[alexcrichton]

Tidy looks like it's failing on travis, but otherwise r=me

[retep998]

Travis appears to have passed.

[sfackler]

@bors r=alexcrichton

[bors]

📌 Commit a1b33b4 has been approved by alexcrichton

[bors]

⌛ Testing commit a1b33b4 with merge ed33659...

[bors]

💔 Test failed - auto-win-msvc-64-opt-rustbuild

[alexcrichton]

@bors: retry

• Cascading failure on bots when interrupted when performing git operations #34595

[alexcrichton]

@bors: retry

• v

On Fri, Jul 1, 2016 at 5:38 AM, bors notifications@github.com wrote:

💔 Test failed - auto-win-msvc-64-opt-rustbuild
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt-rustbuild/builds/1626

—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
#34492 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AAD95Laha4Rqk-EAzk9d8w8-n1iLQqWrks5qRQoogaJpZM4I-q8o
.

[bors]

⌛ Testing commit a1b33b4 with merge 23095ae...

[bors]

💔 Test failed - auto-win-msvc-64-opt-rustbuild

[alexcrichton]

@bors: retry

• Cascading failure on bots when interrupted when performing git operations #34595

[bors]

⌛ Testing commit a1b33b4 with merge 7e07e31...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild