Skip to content

save-analysis: handle aliasing imports a bit more nicely#50399

Merged
bors merged 1 commit intorust-lang:masterfrom
nrc:alias
May 15, 2018
Merged

save-analysis: handle aliasing imports a bit more nicely#50399
bors merged 1 commit intorust-lang:masterfrom
nrc:alias

Conversation

@nrc
Copy link
Member

@nrc nrc commented May 2, 2018

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 2, 2018
@nrc nrc mentioned this pull request May 2, 2018
Closed
5 tasks
eddyb
eddyb reviewed May 3, 2018
View reviewed changes
src/Cargo.lock

[[package]]
name = "rls-data"
version = "0.16.0"
Copy link
Member

@eddyb eddyb May 3, 2018

Choose a reason for hiding this comment

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

This looks maybe a bit wrong? A version of rls-data is added, but the old one isn't removed. What's happening here?

Copy link
Member Author

@nrc nrc May 3, 2018

Choose a reason for hiding this comment

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

The old version is still used by the RLS, it will get removed when we update the RLS. But we'll have to do that in a separate PR (in any case the RLS is broken right now, so it doesn't make much difference).

@eddyb
Copy link
Member

eddyb commented May 3, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented May 3, 2018

📌 Commit 7b378b2 has been approved by eddyb

@bors bors 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-review Status: Awaiting review from the assignee but also interested parties. labels May 3, 2018
@nrc
Copy link
Member Author

nrc commented May 4, 2018

@bors rollup

kennytm added a commit to kennytm/rust that referenced this pull request May 4, 2018
@kennytm
Rollup merge of rust-lang#50399 - nrc:alias, r=eddyb
6cdcd5c 
save-analysis: handle aliasing imports a bit more nicely

r? @eddyb
@kennytm kennytm mentioned this pull request May 4, 2018
Closed
@bors
Copy link
Collaborator

bors commented May 6, 2018

🔒 Merge conflict

@bors bors 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 May 6, 2018
@nrc
Copy link
Member Author

nrc commented May 6, 2018

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented May 6, 2018

📌 Commit b71568c has been approved by eddyb

@bors bors 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 May 6, 2018
@bors
Copy link
Collaborator

bors commented May 7, 2018

⌛ Testing commit b71568cbf0e3e0e40b9bdff6cb006e7fe6b94ca4 with merge 24504ebcafff222ba20419f4cf8143031279a003...

@bors
Copy link
Collaborator

bors commented May 7, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 7, 2018
@nrc
Copy link
Member Author

nrc commented May 7, 2018

Breaks the RLS, but that is deliberate.

@emilyalbini emilyalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 7, 2018
@emilyalbini
Copy link
Member

emilyalbini commented May 7, 2018

Marked as blocked on the beta promotion.

@kennytm
Copy link
Member

kennytm commented May 13, 2018

@bors retry rollup-

Beta has been promoted (pretty sure there will be Cargo.lock conflict though)

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 13, 2018
@bors
Copy link
Collaborator

bors commented May 14, 2018

🔒 Merge conflict

@bors bors 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 May 14, 2018
@nrc nrc force-pushed the alias branch 2 times, most recently from ca984e2 to b588686 Compare May 15, 2018 08:14
@rust-highfive
Copy link
Contributor

rust-highfive commented May 15, 2018

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
[00:01:12] extracting /checkout/obj/build/cache/2018-04-24/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:12] error: failed to resolve patches for `https://github.com/rust-lang/crates.io-index`
[00:01:12] 
[00:01:12] Caused by:
[00:01:12]   patch for `clippy_lints` in `https://github.com/rust-lang/crates.io-index` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:12] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:12] Build completed unsuccessfully in 0:00:13
[00:01:12] Makefile:81: recipe for target 'prepare' failed
[00:01:12] make: *** [prepare] Error 1
[00:01:13] error: failed to resolve patches for `https://github.com/rust-lang/crates.io-index`
[00:01:13] 
[00:01:13] Caused by:
[00:01:13] Caused by:
[00:01:13]   patch for `clippy_lints` in `https://github.com/rust-lang/crates.io-index` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:13] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:13] Build completed unsuccessfully in 0:00:00
[00:01:13] Makefile:81: recipe for target 'prepare' failed
[00:01:13] make: *** [prepare] Error 1
[00:01:15] error: failed to resolve patches for `https://github.com/rust-lang/crates.io-index`
[00:01:15] 
[00:01:15] Caused by:
[00:01:15] Caused by:
[00:01:15]   patch for `clippy_lints` in `https://github.com/rust-lang/crates.io-index` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:15] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:15] Build completed unsuccessfully in 0:00:00
[00:01:15] make: *** [prepare] Error 1
[00:01:15] Makefile:81: recipe for target 'prepare' failed
[00:01:18] error: failed to resolve patches for `https://github.com/rust-lang/crates.io-index`
[00:01:18] 
[00:01:18] Caused by:
[00:01:18] Caused by:
[00:01:18]   patch for `clippy_lints` in `https://github.com/rust-lang/crates.io-index` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:18] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:18] Build completed unsuccessfully in 0:00:00
[00:01:18] Makefile:81: recipe for target 'prepare' failed
[00:01:18] make: *** [prepare] Error 1
[00:01:22] error: failed to resolve patches for `https://github.com/rust-lang/crates.io-index`
[00:01:22] 
[00:01:22] Caused by:
[00:01:22] Caused by:
[00:01:22]   patch for `clippy_lints` in `https://github.com/rust-lang/crates.io-index` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:22] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:22] Build completed unsuccessfully in 0:00:00
[00:01:22] make: *** [prepare] Error 1
[00:01:22] Makefile:81: recipe for target 'prepare' failed
[00:01:22] The command has failed after 5 attempts.

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 1.
travis_time:start:00f70e72
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@nrc
Copy link
Member Author

nrc commented May 15, 2018

The slightly odd Cargo.lock is because assert_cli 0.5.6 was yanked and so we reverted back to 0.5.4

@bors retry rollup

@bors bors 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 May 15, 2018
@kennytm
Copy link
Member

kennytm commented May 15, 2018

@bors r=eddyb a10577c

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 15, 2018
@GuillaumeGomez
Rollup merge of rust-lang#50399 - nrc:alias, r=eddyb
d4bd85d 
save-analysis: handle aliasing imports a bit more nicely

r? @eddyb
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 15, 2018
Merged
bors added a commit that referenced this pull request May 15, 2018
@bors
Auto merge of #50769 - GuillaumeGomez:rollup, r=GuillaumeGomez
27acb9b 
Rollup of 11 pull requests

Successful merges:

 - #49767 (Rewrite docs for `std::ptr`)
 - #50399 (save-analysis: handle aliasing imports a bit more nicely)
 - #50594 (Update the man page with additional --print options)
 - #50613 (Migrate the toolstate update bot to rust-highfive)
 - #50632 (Add minification process)
 - #50685 (ci: Add Dockerfile for dist-sparc64-linux)
 - #50691 (rustdoc: Add support for pub(restricted))
 - #50712 (Improve eager type resolution error message)
 - #50720 (Add “Examples” section header in f32/f64 doc comments.)
 - #50733 (Hyperlink DOI against preferred resolver)
 - #50745 (Uncapitalize "You")

Failed merges:
@bors bors merged commit a10577c into rust-lang:master May 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@eddyb eddyb eddyb left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@eddyb eddyb

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

@nrc @eddyb @bors @emilyalbini @kennytm @rust-highfive