save-analysis: handle aliasing imports a bit more nicely

[nrc]

r? @eddyb

[eddyb]

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

[nrc]

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]

@bors r+

[bors]

📌 Commit 7b378b2 has been approved by eddyb

[nrc]

@bors rollup

[bors]

🔒 Merge conflict

[nrc]

@bors r=eddyb

[bors]

📌 Commit b71568c has been approved by eddyb

[bors]

⌛ Testing commit b71568cbf0e3e0e40b9bdff6cb006e7fe6b94ca4 with merge 24504ebcafff222ba20419f4cf8143031279a003...

[bors]

💔 Test failed - status-appveyor

[nrc]

Breaks the RLS, but that is deliberate.

[pietroalbini]

Marked as blocked on the beta promotion.

[kennytm]

@bors retry rollup-

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

[bors]

🔒 Merge conflict

[rust-highfive]

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]

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

[kennytm]

@bors r=eddyb a10577c