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.

Sign up for GitHub

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

Jump to bottom

Bump cargo for rust-lang/cargo#4000 #41830

Merged
merged 1 commit into from
May 9, 2017
Merged

Bump cargo for rust-lang/cargo#4000 #41830

merged 1 commit into from
May 9, 2017

Conversation

jonhoo
Copy link
Contributor

@jonhoo jonhoo commented May 8, 2017

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
Copy link
Collaborator

r? @aturon

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

@jonhoo jonhoo mentioned this pull request May 8, 2017
Merged
@jonhoo
Copy link
Contributor Author

jonhoo commented May 8, 2017

@bors: r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned aturon May 8, 2017
@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented May 8, 2017

📌 Commit 2827718 has been approved by alexcrichton

@jonhoo
Copy link
Contributor Author

jonhoo commented May 8, 2017 •
edited
Loading

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
Copy link
Member

@bors p=1

@frewsxcv frewsxcv mentioned this pull request May 9, 2017
Closed
@bors
Copy link
Contributor

bors commented May 9, 2017

⌛ Testing commit 2827718 with merge c35b85d...

@bors
Copy link
Contributor

bors commented May 9, 2017

💔 Test failed - status-travis

@Mark-Simulacrum
Copy link
Member

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
Copy link
Contributor Author

jonhoo commented May 9, 2017

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
Copy link
Contributor Author

jonhoo commented May 9, 2017 •
edited
Loading

Ah, looks like I also missed updating the other cargo 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 jonhoo mentioned this pull request May 9, 2017
Merged
@jonhoo
Copy link
Contributor Author

jonhoo commented May 9, 2017

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
Copy link
Member

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
Copy link
Contributor Author

jonhoo commented May 9, 2017

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.

@arielb1 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
bors added a commit to rust-lang/cargo that referenced this pull request May 9, 2017
@bors
Auto merge of #4010 - jonhoo:better-incremental-nightly-test, r=alexc…
cf17c9f 
…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).
@durka durka mentioned this pull request May 9, 2017
Closed
@jonhoo
Copy link
Contributor Author

jonhoo commented May 9, 2017

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

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented May 9, 2017

📌 Commit 1617eee has been approved by alexcrichton

@alexcrichton alexcrichton mentioned this pull request May 9, 2017
Open
@bors
Copy link
Contributor

bors commented May 9, 2017

⌛ Testing commit 1617eee with merge d3abc80...

bors added a commit that referenced this pull request May 9, 2017
@bors
Auto merge of #41830 - jonhoo:update-cargo, r=alexcrichton
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
Copy link
Contributor

bors commented May 9, 2017

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

@bors bors merged commit 1617eee into rust-lang:master May 9, 2017
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jun 6, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jonhoo @rust-highfive @alexcrichton @bors @Mark-Simulacrum @aturon @arielb1