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

Make --emit dep-info work correctly with -Z no-analysis again. #33450

Merged
merged 6 commits into from
May 13, 2016

Conversation

SiegeLord
Copy link
Contributor

Previously, it would attempt to resolve some external crates that weren't necessary for dep-info output.

Fixes #33231.

@rust-highfive
Copy link
Collaborator

r? @nrc

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

{
let _ignore = hir_map.dep_graph.in_ignore();
controller_entry_point!(after_write_deps,
controller_entry_point!(after_ast,
Copy link
Member

Choose a reason for hiding this comment

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

I think after_hir_lowering might be a better name here - ast is a data structure rather than a phase.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@nrc
Copy link
Member

nrc commented May 8, 2016

lgtm, r+ with the name changed

@nrc
Copy link
Member

nrc commented May 9, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented May 9, 2016

📌 Commit 5ec8e92 has been approved by nrc

@bors
Copy link
Contributor

bors commented May 9, 2016

⌛ Testing commit 5ec8e92 with merge 82f2240...

@bors
Copy link
Contributor

bors commented May 9, 2016

💔 Test failed - auto-win-gnu-32-opt-rustbuild

@SiegeLord
Copy link
Contributor Author

Whoops, looks like my regex failed on Windows. Could you approve again?

@bors
Copy link
Contributor

bors commented May 10, 2016

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

@SiegeLord SiegeLord force-pushed the dep_info_no_analysis branch from 8687aa8 to ba04a52 Compare May 11, 2016 02:23
@SiegeLord
Copy link
Contributor Author

Re-based onto master.

@nrc
Copy link
Member

nrc commented May 11, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented May 11, 2016

📌 Commit ba04a52 has been approved by nrc

@oli-obk
Copy link
Contributor

oli-obk commented May 12, 2016

This failed the rollup:

---- [run-make] run-make/dep-info-no-analysis stdout ----

error: make failed
status: exit code: 2
command: "make"
stdout:
------------------------------------------
DYLD_LIBRARY_PATH="/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/run-make/dep-info-no-analysis.stage2-x86_64-apple-darwin:/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2/lib:/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps:/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2-rustc/x86_64-apple-darwin/release/deps:/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2-test/x86_64-apple-darwin/release/deps:/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2-std/x86_64-apple-darwin/release/deps:" '/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2/bin/rustc' --out-dir /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/run-make/dep-info-no-analysis.stage2-x86_64-apple-darwin -L /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/run-make/dep-info-no-analysis.stage2-x86_64-apple-darwin  -o /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/run-make/dep-info-no-analysis.stage2-x86_64-apple-darwin/input.dd -Z no-analysis --emit dep-info input.rs
sed -i "s/^.*input.dd/input.dd/g" /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/run-make/dep-info-no-analysis.stage2-x86_64-apple-darwin/input.dd

------------------------------------------
stderr:
------------------------------------------
warning: ignoring --out-dir flag due to -o flag.
sed: -i may not be used with stdin
make[1]: *** [all] Error 1

------------------------------------------

thread '[run-make] run-make/dep-info-no-analysis' panicked at 'explicit panic', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/src/tools/compiletest/src/runtest.rs:1543
note: Run with `RUST_BACKTRACE=1` for a backtrace.


failures:
    [run-make] run-make/dep-info-no-analysis

@bors
Copy link
Contributor

bors commented May 12, 2016

⌛ Testing commit ba04a52 with merge 487dffe...

@eddyb
Copy link
Member

eddyb commented May 12, 2016

@bors r-

@bors
Copy link
Contributor

bors commented May 12, 2016

⛄ The build was interrupted to prioritize another pull request.

@SiegeLord
Copy link
Contributor Author

SiegeLord commented May 12, 2016

::sigh:: this wouldn't be a problem if rustc didn't put the absolute path inside the deps file, which requires me to sed it away...

@SiegeLord
Copy link
Contributor Author

I fixed the sed invocation to work with BSD utils, so should be ok to try this again.

@eddyb
Copy link
Member

eddyb commented May 12, 2016

@bors r=nrc

@bors
Copy link
Contributor

bors commented May 12, 2016

📌 Commit 215b260 has been approved by nrc

eddyb added a commit to eddyb/rust that referenced this pull request May 12, 2016
Make --emit dep-info work correctly with -Z no-analysis again.

Previously, it would attempt to resolve some external crates that weren't necessary for dep-info output.

Fixes rust-lang#33231.
bors added a commit that referenced this pull request May 12, 2016
@bors
Copy link
Contributor

bors commented May 13, 2016

⌛ Testing commit 215b260 with merge 01ed700...

bors added a commit that referenced this pull request May 13, 2016
Make --emit dep-info work correctly with -Z no-analysis again.

Previously, it would attempt to resolve some external crates that weren't necessary for dep-info output.

Fixes #33231.
@bors bors merged commit 215b260 into rust-lang:master May 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dep-info + -Z no-analysis no longer ignore extern crates
7 participants