Bump cargo for rust-lang/cargo#4000 by jonhoo · Pull Request #41830 · rust-lang/rust

jonhoo · 2017-05-08T16:10:50Z

rust-lang/cargo#4000 recently landed, which fixes warnings about using -Z when CARGO_INCREMENTAL is set while running stable/beta builds. As #41751 has now landed, these warnings will turn to errors in the next release, so getting the cargo fix in place is necessary unless we want people confused about why they can no longer compile anything on stable/beta.

rust-highfive · 2017-05-08T16:10:56Z

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

jonhoo · 2017-05-08T16:11:18Z

@bors: r? @alexcrichton

alexcrichton · 2017-05-08T16:12:06Z

@bors: r+

Thanks!

bors · 2017-05-08T16:12:09Z

📌 Commit 2827718 has been approved by alexcrichton

jonhoo · 2017-05-08T21:27:39Z

Due to #37107, this keeps being bumped down the homu queue :(
It'd be great to have this included in the next nightly (which if I remember correctly is built in ~2h).
Any chance of a rollup?

Mark-Simulacrum · 2017-05-09T00:44:39Z

@bors p=1

bors · 2017-05-09T02:18:19Z

⌛ Testing commit 2827718 with merge c35b85d...

bors · 2017-05-09T03:36:09Z

💔 Test failed - status-travis

Mark-Simulacrum · 2017-05-09T03:40:13Z

Legitimate failure, I believe:

[01:11:08] failures:
[01:11:08] [01:11:08] ---- cargo_compile_incremental stdout ----
[01:11:08] libdir: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib"
[01:11:08] running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo build -v`
[01:11:08] thread 'cargo_compile_incremental' panicked at '
[01:11:08] Expected: execs
[01:11:08] but: expected to find:
[01:11:08] [RUNNING] `rustc [..] -Zincremental=[..][/]target[/]debug[/]incremental`
[01:11:08] [01:11:08] [01:11:08] did not find in output:
[01:11:08] Compiling foo v0.5.0 (file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t11/foo)
[01:11:08] Running `rustc --crate-name foo src/foo.rs --crate-type bin --emit=dep-info,link -C debuginfo=2 -C metadata=e1a5230cf4545c49 -C extra-filename=-e1a5230cf4545c49 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t11/foo/target/debug/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t11/foo/target/debug/deps`
[01:11:08] Finished dev [unoptimized + debuginfo] target(s) in 0.57 secs
[01:11:08] ', /cargo/registry/src/github.com-1ecc6299db9ec823/hamcrest-0.1.1/src/core.rs:31
[01:11:08] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:11:08] [01:11:08] [01:11:08] failures:
[01:11:08] cargo_compile_incremental
[01:11:08] [01:11:08] test result: FAILED. 98 passed; 1 failed; 0 ignored; 0 measured
[01:11:08] [01:11:08] error: test failed, to rerun pass '--test build'

jonhoo · 2017-05-09T03:42:03Z

I'm quite confused. The same test passes just fine in the cargo repository...
Only thing I can think of is that is_nightly is defined as

 r.verbose_version.contains("-nightly") ||
r.verbose_version.contains("-dev")

Whereas the cargo PR only checks for contains("nightly"). Could it be that rust compiles with -dev?

jonhoo · 2017-05-09T03:49:32Z

Ah, looks like I also missed updating the othercargo submodule at src/tools/cargo. I'll update the PR, and also separate file a cargo PR to update the nightly version matching.

EDIT: Nope, looks like git is smart enough to keep them the same revision. Well then -- I guess it's probably the version matching then?

jonhoo · 2017-05-09T03:58:57Z

It is slightly disturbing that all cargo tests passed in the cargo repo, but then one of them fails here. Suggests a mismatch in the setups that maybe we should look into. @alexcrichton any idea why this might happen?

alexcrichton · 2017-05-09T04:03:35Z

Heh I can name a zillion differences between the two, any one of which could cause tests to pass in one location and fail in the other. In any case rust-lang/cargo#4010 should fix this.

jonhoo · 2017-05-09T04:04:20Z

Hehe, fair. Well, that's the hope. If that fails I'm not entirely sure what else it could be. Let's wait and see.

…richton Bring test of nightly in line with tests #4000 passes `-Zincremental` to `rustc` only on nightly, but uses a different mechanism for detecting nightly than [cargotest does](https://github.com/rust-lang/cargo/blob/9bf9bddd9297cfb5098be6146d85be551c6d4eff/tests/cargotest/lib.rs#L37). This PR brings the two in line, which should hopefully fix the build failure observed in rust-lang/rust#41830 (comment).

Also relies on rust-lang/cargo#4010

jonhoo · 2017-05-09T16:21:16Z

I eagerly pushed a new commit using #4010 with the expectation that @bors will be happy with it.

alexcrichton · 2017-05-09T17:16:30Z

@bors: r+

bors · 2017-05-09T17:16:31Z

📌 Commit 1617eee has been approved by alexcrichton

bors · 2017-05-09T19:31:40Z

⌛ Testing commit 1617eee with merge d3abc80...

Bump cargo for rust-lang/cargo#4000 rust-lang/cargo#4000 recently landed, which fixes warnings about using `-Z` when `CARGO_INCREMENTAL` is set while running stable/beta builds. As #41751 has now landed, these warnings will turn to errors in the next release, so getting the cargo fix in place is necessary unless we want people confused about why they can no longer compile anything on stable/beta.

bors · 2017-05-09T23:11:48Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing d3abc80 to master...

rust-highfive assigned aturon May 8, 2017

jonhoo mentioned this pull request May 8, 2017
Only pass -Zincremental to nightly rustc. rust-lang/cargo#4000
Merged

rust-highfive assigned alexcrichton and unassigned aturon May 8, 2017

frewsxcv mentioned this pull request May 9, 2017
Rollup of 10 pull requests #41845
Closed

jonhoo mentioned this pull request May 9, 2017
Bring test of nightly in line with tests rust-lang/cargo#4010
Merged

arielb1 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 9, 2017

durka mentioned this pull request May 9, 2017
Cross-repo issue link in issue title refined-github/refined-github#412
Closed

Bump cargo forrust-lang/cargo#4000
1617eee
Also relies on rust-lang/cargo#4010

jonhoo force-pushed the update-cargo branch from 2827718 to 1617eeeCompare May 9, 2017 16:16

alexcrichton mentioned this pull request May 9, 2017
Cargo can't find git credentials for private repo anymore rust-lang/cargo#3487
Open

bors merged commit 1617eee into rust-lang:masterMay 9, 2017

Mark-Simulacrum mentioned this pull request Jun 6, 2017
Rust 1.19 regression, geogrid 0.3.0 #42458
Closed

Uh oh!

Uh oh!

Conversation

jonhoo commented May 8, 2017

Uh oh!

rust-highfive commented May 8, 2017

Uh oh!

jonhoo commented May 8, 2017

Uh oh!

alexcrichton commented May 8, 2017

Uh oh!

bors commented May 8, 2017

Uh oh!

jonhoo commented May 8, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mark-Simulacrum commented May 9, 2017

Uh oh!

bors commented May 9, 2017

Uh oh!

bors commented May 9, 2017

Uh oh!

Mark-Simulacrum commented May 9, 2017

Uh oh!

jonhoo commented May 9, 2017

Uh oh!

jonhoo commented May 9, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonhoo commented May 9, 2017

Uh oh!

alexcrichton commented May 9, 2017

Uh oh!

jonhoo commented May 9, 2017

Uh oh!

jonhoo commented May 9, 2017

Uh oh!

alexcrichton commented May 9, 2017

Uh oh!

bors commented May 9, 2017

Uh oh!

bors commented May 9, 2017

Uh oh!

bors commented May 9, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jonhoo commented May 8, 2017•
edited
Loading

jonhoo commented May 9, 2017•
edited
Loading