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

Update to rust 2015-03-22 #1440

Merged
merged 3 commits into from
Mar 23, 2015
Merged

Update to rust 2015-03-22 #1440

merged 3 commits into from
Mar 23, 2015

Conversation

tamird
Copy link
Contributor

@tamird tamird commented Mar 23, 2015

@rust-highfive
Copy link

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see CONTRIBUTING.md for more information.

@@ -455,6 +455,7 @@ test!(cross_with_a_build_script {
"#)
.file("build.rs", format!(r#"
use std::env;
use std::old_path::{{Path, GenericPath}};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this on purpose double {{}} instead of single {}? Just wondering, I haven't seen this in rust before.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this is a format string - the escaping is required

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahhh, ok, that makes sense. Thanks!

@tamird
Copy link
Contributor Author

tamird commented Mar 23, 2015

This travis failure looks like a flake. This should be good to go. r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned wycats Mar 23, 2015
@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Mar 23, 2015

📌 Commit 901f66b has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 23, 2015

⌛ Testing commit 901f66b with merge 8b808ff...

@bors
Copy link
Contributor

bors commented Mar 23, 2015

💔 Test failed - cargo-mac-32

@alexcrichton
Copy link
Member

Hm those do not look flaky, I haven't seen many of those before, I think that those failures warrant some investigation.

@alexcrichton
Copy link
Member

I had to apply this patch to get it to pass tests locally.

@tamird
Copy link
Contributor Author

tamird commented Mar 23, 2015

@alexcrichton nice, thanks for tracking that down!

@alexcrichton
Copy link
Member

@bors: r+ 907bfe7

@bors
Copy link
Contributor

bors commented Mar 23, 2015

⌛ Testing commit 907bfe7 with merge 8d4bf72...

@bors
Copy link
Contributor

bors commented Mar 23, 2015

💔 Test failed - cargo-win-64

@alexcrichton
Copy link
Member

@bors: retry

Now that's a spurious failure

@bors
Copy link
Contributor

bors commented Mar 23, 2015

⚡ Previous build results for cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32 are reusable. Rebuilding only cargo-linux-32, cargo-win-64...

@tamird
Copy link
Contributor Author

tamird commented Mar 23, 2015

that linux travis build really had some trouble O.o

@bors
Copy link
Contributor

bors commented Mar 23, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32, cargo-win-64

@bors bors merged commit 907bfe7 into rust-lang:master Mar 23, 2015
@tamird tamird deleted the rustup branch March 23, 2015 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants