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

Emit crate disambiguators in save-analysis data #45468

Merged
merged 3 commits into from Nov 2, 2017

Conversation

Projects
None yet
5 participants
@Xanewok
Copy link
Member

Xanewok commented Oct 23, 2017

Needed for rust-dev-tools/rls-analysis#93.
Blocked by rust-dev-tools/rls-data#11. (For now, this pulls my branch rls-data/crate-source)

This will allow to disambiguate different crates types/versions when indexing resulting save-analysis data (most importantly allow to support bin+lib and different crate versions).

r? @nrc

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Oct 23, 2017

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (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. Due to 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 the contribution instructions for more information.

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 26, 2017

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

@nrc

This comment has been minimized.

Copy link
Member

nrc commented Oct 27, 2017

r+ once the rls-data PR lands and using the new rls-data version.

@Xanewok Xanewok force-pushed the Xanewok:crate-source branch from 444f8ed to 45fa7b2 Oct 27, 2017

@Xanewok

This comment has been minimized.

Copy link
Member Author

Xanewok commented Oct 27, 2017

Resolved conflict and updated version using rls-data 0.12

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Oct 28, 2017

@Xanewok Is this PR still [WIP], or is it ready to be merged? 🙂

@Xanewok Xanewok changed the title [WIP] Emit crate disambiguators in save-analysis data Emit crate disambiguators in save-analysis data Oct 29, 2017

@Xanewok

This comment has been minimized.

Copy link
Member Author

Xanewok commented Oct 29, 2017

@kennytm it's ready!
@nrc in these cases should I do something like r=nrc with bors?

@nrc

This comment has been minimized.

Copy link
Member

nrc commented Oct 29, 2017

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 29, 2017

📌 Commit 45fa7b2 has been approved by nrc

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 30, 2017

⌛️ Testing commit 45fa7b2 with merge e0108b3...

bors added a commit that referenced this pull request Oct 30, 2017

Auto merge of #45468 - Xanewok:crate-source, r=nrc
Emit crate disambiguators in save-analysis data

Needed for rust-dev-tools/rls-analysis#93.
Blocked by rust-dev-tools/rls-data#11. (For now, this pulls my branch [rls-data/crate-source](https://github.com/Xanewok/rls-data/tree/crate-source))

This will allow to disambiguate different crates types/versions when indexing resulting save-analysis data (most importantly allow to support bin+lib and different crate versions).

r? @nrc
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 30, 2017

💔 Test failed - status-appveyor

@Xanewok

This comment has been minimized.

Copy link
Member Author

Xanewok commented Oct 30, 2017

@nrc this failed on compiling rls (rls-data mismatch).
The rls needs to pull new rls-data 0.12, but with that it needs also the updated rls-analysis (PR pending rust-dev-tools/rls-analysis#106).
I pushed a branch upstream with a patch for rls: https://github.com/rust-lang-nursery/rls/tree/multiple-analysis, but that still has to pull my custom branch - not sure if rustbuild with --frozen will let me do that.

What should we do here to resolve this?

Xanewok added a commit to Xanewok/rust that referenced this pull request Oct 30, 2017

@Xanewok Xanewok force-pushed the Xanewok:crate-source branch from c53b39e to 930464e Oct 30, 2017

Xanewok added a commit to Xanewok/rust that referenced this pull request Oct 30, 2017

@Xanewok

This comment has been minimized.

Copy link
Member Author

Xanewok commented Oct 30, 2017

Updating rls submodule to rust-45468 branch, so it can compile with these changes.

@nrc

This comment has been minimized.

Copy link
Member

nrc commented Oct 31, 2017

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 31, 2017

📌 Commit 930464e has been approved by nrc

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 31, 2017

⌛️ Testing commit 930464e with merge 3e2d634...

bors added a commit that referenced this pull request Oct 31, 2017

Auto merge of #45468 - Xanewok:crate-source, r=nrc
Emit crate disambiguators in save-analysis data

Needed for rust-dev-tools/rls-analysis#93.
Blocked by rust-dev-tools/rls-data#11. (For now, this pulls my branch [rls-data/crate-source](https://github.com/Xanewok/rls-data/tree/crate-source))

This will allow to disambiguate different crates types/versions when indexing resulting save-analysis data (most importantly allow to support bin+lib and different crate versions).

r? @nrc
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 31, 2017

💔 Test failed - status-appveyor

@Xanewok

This comment has been minimized.

Copy link
Member Author

Xanewok commented Oct 31, 2017

single test in rls failed:

failures:
---- server::test::test_use_root_uri stdout ----
	thread 'server::test::test_use_root_uri' panicked at 'Could not convert URI to path: ()', src\libcore\result.rs:906:4
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures:
    server::test::test_use_root_uri
test result: FAILED. 27 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
error: test failed, to rerun pass '--bin rls'

@Xanewok Xanewok force-pushed the Xanewok:crate-source branch from 930464e to b4ffede Oct 31, 2017

@nrc

This comment has been minimized.

Copy link
Member

nrc commented Oct 31, 2017

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 31, 2017

📌 Commit b4ffede has been approved by nrc

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 1, 2017

⌛️ Testing commit b4ffede with merge b56c518...

bors added a commit that referenced this pull request Nov 1, 2017

Auto merge of #45468 - Xanewok:crate-source, r=nrc
Emit crate disambiguators in save-analysis data

Needed for rust-dev-tools/rls-analysis#93.
Blocked by rust-dev-tools/rls-data#11. (For now, this pulls my branch [rls-data/crate-source](https://github.com/Xanewok/rls-data/tree/crate-source))

This will allow to disambiguate different crates types/versions when indexing resulting save-analysis data (most importantly allow to support bin+lib and different crate versions).

r? @nrc
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 1, 2017

💔 Test failed - status-travis

@Xanewok

This comment has been minimized.

Copy link
Member Author

Xanewok commented Nov 1, 2017

arm-android CI build hung up on libstd test:

No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Nov 1, 2017

@bors retry #43283

[01:28:23] test process::tests::test_process_output_fail_to_start has been running for over 60 seconds


No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received

The build has been terminated
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 2, 2017

⌛️ Testing commit b4ffede with merge 2379faa...

bors added a commit that referenced this pull request Nov 2, 2017

Auto merge of #45468 - Xanewok:crate-source, r=nrc
Emit crate disambiguators in save-analysis data

Needed for rust-dev-tools/rls-analysis#93.
Blocked by rust-dev-tools/rls-data#11. (For now, this pulls my branch [rls-data/crate-source](https://github.com/Xanewok/rls-data/tree/crate-source))

This will allow to disambiguate different crates types/versions when indexing resulting save-analysis data (most importantly allow to support bin+lib and different crate versions).

r? @nrc
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 2, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing 2379faa to master...

@bors bors merged commit b4ffede into rust-lang:master Nov 2, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.