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

Update Cargo and its dependencies #46630

Merged
merged 1 commit into from
Dec 24, 2017
Merged

Update Cargo and its dependencies #46630

merged 1 commit into from
Dec 24, 2017
+143 −106

Conversation

alexcrichton
Copy link
Member

Just a routine update!

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 10, 2017
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Dec 11, 2017

📌 Commit e21b4f6 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 11, 2017

⌛ Testing commit e21b4f6 with merge d370519...

bors added a commit that referenced this pull request Dec 11, 2017
@bors
Auto merge of #46630 - alexcrichton:update-git2, r=nikomatsakis
d370519 
Update Cargo and its dependencies

Just a routine update!
@bors
Copy link
Contributor

bors commented Dec 11, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Dec 11, 2017

A test in cargo failed, looks legit.

[01:09:13] ---- bad_git_dependency stdout ----
[01:09:13] 	running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo build -v`
[01:09:13] thread 'bad_git_dependency' panicked at '
[01:09:13] Expected: execs
[01:09:13]     but: differences:
[01:09:13]  10 - |  [[..]] 'file:///' is not a valid local file URI|
[01:09:13]     + |  'file:///' is not a valid local file URI; class=Config (7)|
[01:09:13] 
[01:09:13] 
[01:09:13] other output:
[01:09:13] ``', /cargo/registry/src/github.com-1ecc6299db9ec823/hamcrest-0.1.1/src/core.rs:31:12
[01:09:13] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:09:13] 
[01:09:13] 
[01:09:13] failures:
[01:09:13]     bad_git_dependency
[01:09:13] 
[01:09:13] test result: FAILED. 36 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2017
@alexcrichton
Copy link
Member Author

@bors: r=nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 13, 2017

📌 Commit 955c8e7 has been approved by nikomatsakis

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 13, 2017
@bors
Copy link
Contributor

bors commented Dec 13, 2017

⌛ Testing commit 955c8e7332ebe8c9ca8fa124fd2f19fcbe8b79ba with merge 015ce4e103205a9c537cbd435d1c13fff0179d0b...

@bors bors mentioned this pull request Dec 13, 2017
Merged
@bors
Copy link
Contributor

bors commented Dec 13, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Dec 13, 2017

This has broken several RLS tests (cc @nrc)? Not sure if legit.

[01:12:17] ---- test::test_find_all_refs stdout ----
...
[01:12:17] thread 'test::test_find_all_refs' panicked at 'Could not find `{"start":{"line":9,"character":7},"end":{"line":9,"character":10}}` in `{"jsonrpc":"2.0","id":42,"result":[]}`', /checkout/src/libcore/option.rs:891:4
[01:12:17] 
[01:12:17] ---- test::test_find_all_refs_no_cfg_test stdout ----
...
[01:12:17] thread 'test::test_find_all_refs_no_cfg_test' panicked at 'Could not find `{"start":{"line":9,"character":7},"end":{"line":9,"character":10}}` in `{"jsonrpc":"2.0","id":42,"result":[]}`', /checkout/src/libcore/option.rs:891:4
...
[01:12:17] failures:
[01:12:17]     test::test_borrow_error
[01:12:17]     test::test_features
[01:12:17]     test::test_find_all_refs
[01:12:17]     test::test_find_all_refs_no_cfg_test
[01:12:17]     test::test_find_impls
[01:12:17]     test::test_goto_def
[01:12:17]     test::test_highlight
[01:12:17]     test::test_hover
[01:12:17]     test::test_infer_bin
[01:12:17]     test::test_infer_custom_bin
[01:12:17]     test::test_infer_lib
[01:12:17]     test::test_multiple_binaries
[01:12:17]     test::test_no_default_features
[01:12:17]     test::test_parse_error_on_malformed_input
[01:12:17]     test::test_rename
[01:12:17]     test::test_workspace_symbol
[01:12:17] 
[01:12:17] test result: FAILED. 11 passed; 16 failed; 0 ignored; 0 measured; 0 filtered out

@alexcrichton
Copy link
Member Author

@bors: r+

prays it's spurious

@bors
Copy link
Contributor

bors commented Dec 15, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Dec 15, 2017

📌 Commit 955c8e7 has been approved by alexcrichton

@alexcrichton
Copy link
Member Author

@bors: retry

@nrc
Copy link
Member

nrc commented Dec 15, 2017

This doesn't look spurious to me. I updated Cargo locally and get the same failures in the RLS. The pattern of failure is what happens when no compilation happens. Probably something changed in the Cargo API which is screwing up the RLS, but nothing in Cargo's commit log looks suspicious.

@bors
Copy link
Contributor

bors commented Dec 15, 2017

🔒 Merge conflict

@alexcrichton
Copy link
Member Author

@nrc can you help me debug this? I spent a few hours yesterday tracing through rls tests and the rls iteslf (I found the output quite difficult to debug) and I even reverted Cargo back to the original revision and still got the same error.

The few commits landing in Cargo have what I would presume as minor changes. There's some minor tweaks but I can't make heads or tails of anything in the rls logs and/or internals as to what's actually changing or where the error is coming from.

@bors
Copy link
Contributor

bors commented Dec 15, 2017

☔ The latest upstream changes (presumably #46740) made this pull request unmergeable. Please resolve the merge conflicts.

@nrc
Copy link
Member

nrc commented Dec 18, 2017

Yep, looking into it now.

@bors
Copy link
Contributor

bors commented Dec 23, 2017

📌 Commit 6bdc986 has been approved by nikomatsakis

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 23, 2017
@bors
Copy link
Contributor

bors commented Dec 23, 2017

⌛ Testing commit 6bdc9865b9a99b0764b9148b8d207c022ce6b0c7 with merge 5f1d1fdc9f6ea3b7c8d3fe7dc17b52afac731b75...

@bors
Copy link
Contributor

bors commented Dec 23, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

Ok I've debugged this to something unrelated (the debugging stuff I added to the test didn't help). It's an issue with using the bundled libcurl, still investigating...

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 24, 2017
@alexcrichton
Copy link
Member Author

@bors: r=nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 24, 2017

📌 Commit 61eca72 has been approved by nikomatsakis

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 24, 2017
@bors
Copy link
Contributor

bors commented Dec 24, 2017

🔒 Merge conflict

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 24, 2017
@alexcrichton
Update Cargo and its dependencies
325d739 
Just a routine update!
@alexcrichton
Copy link
Member Author

@bors: r=nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 24, 2017

📌 Commit 325d739 has been approved by nikomatsakis

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 24, 2017
@bors
Copy link
Contributor

bors commented Dec 24, 2017

⌛ Testing commit 325d739 with merge b9e4d34...

bors added a commit that referenced this pull request Dec 24, 2017
@bors
Auto merge of #46630 - alexcrichton:update-git2, r=nikomatsakis
b9e4d34 
Update Cargo and its dependencies

Just a routine update!
@bors
Copy link
Contributor

bors commented Dec 24, 2017

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

@bors bors merged commit 325d739 into rust-lang:master Dec 24, 2017
@alexcrichton alexcrichton mentioned this pull request Dec 26, 2017
Closed
@alexcrichton alexcrichton deleted the update-git2 branch January 23, 2018 03:02
@kennytm kennytm mentioned this pull request Jun 14, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @nikomatsakis @bors @kennytm @nrc