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

save-analysis: bug fix and optimisation. #55521

Merged
merged 2 commits into from
Nov 1, 2018
Merged

save-analysis: bug fix and optimisation. #55521

merged 2 commits into from
Nov 1, 2018

Conversation

nrc
Copy link
Member

@nrc nrc commented Oct 30, 2018

The first commit fixes a bug in name resolution and save-analysis (introduced in #54145) and removes an unused parameter. This fixes the RLS tests, which are currently blocking distribution of the RLS. The second commit removes macro uses from save-analysis data, since these are never used, they just take up space.

r? @petrochenkov

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 30, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 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.
travis_time:end:0471fe76:start=1540943484910404978,finish=1540943539057325828,duration=54146920850
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
---
[00:18:33]    Compiling rustc_codegen_utils v0.0.0 (/checkout/src/librustc_codegen_utils)
[00:18:33]    Compiling rustc_passes v0.0.0 (/checkout/src/librustc_passes)
[00:18:33]    Compiling rustc_lint v0.0.0 (/checkout/src/librustc_lint)
[00:18:33]    Compiling rustc_borrowck v0.0.0 (/checkout/src/librustc_borrowck)
[00:18:59] error: method is never used: `macro_use`
[00:18:59]   --> librustc_save_analysis/json_dumper.rs:96:5
[00:18:59]    |
[00:18:59] 96 |     pub fn macro_use(&mut self, data: MacroRef) {
[00:18:59]    |
[00:18:59]    = note: `-D dead-code` implied by `-D warnings`
[00:18:59] 
[00:18:59] 
[00:18:59] error: field is never used: `macro_calls`
[00:18:59]   --> librustc_save_analysis/dump_visitor.rs:95:5
[00:18:59]    |
[00:18:59] 95 |     macro_calls: FxHashSet<Span>,
[00:18:59] 
[00:18:59] error: aborting due to 2 previous errors
[00:18:59] 
[00:18:59] error: Could not compile `rustc_save_analysis`.
[00:18:59] error: Could not compile `rustc_save_analysis`.
[00:18:59] 
[00:18:59] To learn more, run the command again with --verbose.
[00:18:59] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:18:59] expected success, got: exit code: 101
[00:18:59] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1115:9
[00:18:59] travis_fold:end:stage0-rustc

[00:18:59] travis_time:end:stage0-rustc:start=1540943874000957753,finish=1540944690026735694,duration=816025777941


[00:18:59] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:18:59] Build completed unsuccessfully in 0:14:46
[00:18:59] Makefile:28: recipe for target 'all' failed
[00:18:59] make: *** [all] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:06e47b68
$ 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)

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 31, 2018

📌 Commit 435d832 has been approved by petrochenkov

@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 Oct 31, 2018
@nrc
Copy link
Member Author

nrc commented Oct 31, 2018

@bors: p=1 (required to get RLS distributing again)

@bors
Copy link
Contributor

bors commented Oct 31, 2018

⌛ Testing commit 435d832 with merge fabbe05...

bors added a commit that referenced this pull request Oct 31, 2018
save-analysis: bug fix and optimisation.

The first commit fixes a bug in name resolution and save-analysis (introduced in #54145) and removes an unused parameter. This fixes the RLS tests, which are currently blocking distribution of the RLS. The second commit removes macro uses from save-analysis data, since these are never used, they just take up space.

r? @petrochenkov
@bors
Copy link
Contributor

bors commented Nov 1, 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 Nov 1, 2018
@nrc
Copy link
Member Author

nrc commented Nov 1, 2018

@bors: retry (timeout)

@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 Nov 1, 2018
@bors
Copy link
Contributor

bors commented Nov 1, 2018

⌛ Testing commit 435d832 with merge c613d26...

bors added a commit that referenced this pull request Nov 1, 2018
save-analysis: bug fix and optimisation.

The first commit fixes a bug in name resolution and save-analysis (introduced in #54145) and removes an unused parameter. This fixes the RLS tests, which are currently blocking distribution of the RLS. The second commit removes macro uses from save-analysis data, since these are never used, they just take up space.

r? @petrochenkov
@bors
Copy link
Contributor

bors commented Nov 1, 2018

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

@bors bors merged commit 435d832 into rust-lang:master Nov 1, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #55521!

Tested on commit c613d26.
Direct link to PR: #55521

🎉 rls on windows: test-fail → test-pass.
🎉 rls on linux: test-fail → test-pass.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 1, 2018
Tested on commit rust-lang/rust@c613d26.
Direct link to PR: <rust-lang/rust#55521>

🎉 rls on windows: test-fail → test-pass.
🎉 rls on linux: test-fail → test-pass.
@nrc nrc added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 19, 2018
@nikomatsakis nikomatsakis added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Nov 19, 2018
@nikomatsakis nikomatsakis mentioned this pull request Nov 20, 2018
20 tasks
@alexcrichton alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Nov 20, 2018
@alexcrichton alexcrichton added this to the Rust 2018 Release milestone Nov 20, 2018
bors added a commit that referenced this pull request Nov 20, 2018
beta backport rollup

Backports of some beta-approved PRs

- [x] #55385: NLL: cast causes failure to promote to static
- [x] #56043: remove "approx env bounds" if we already know from trait
- [x] #56003: do not propagate inferred bounds on trait objects if they involve `Self`
- [x] #55852: Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint
- [x] #55804: rustdoc: don't inline `pub use some_crate` unless directly asked to
- [x] #56059: Increase `Duration` approximate equal threshold to 1us
- [x]  Keep resolved defs in path prefixes and emit them in save-analysis #54145
- [x]  Adjust Ids of path segments in visibility modifiers #55487
- [x]  save-analysis: bug fix and optimisation. #55521
- [x]   save-analysis: be even more aggressive about ignorning macro-generated defs #55936
- [x]  save-analysis: fallback to using path id #56060
- [x]  save-analysis: Don't panic for macro-generated use globs #55879
- [x]  Add temporary renames to manifests for rustfmt/clippy #56081
- [x] Revert #51601 #56049
- [x]  Fix stability hole with `static _` #55983
- [x] #56077
- [x] Fix Rustdoc ICE when checking blanket impls #55258
- [x]  Updated RELEASES.md for 1.31.0 #55678
- [x] ~~#56061~~ #56111
- [x]  Stabilize `extern_crate_item_prelude` #56032

Still running tests locally, and I plan to backport @nrc's other PRs too

(cc @petrochenkov -- thanks for the advice)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants