Make --emit dep-info work correctly with -Z no-analysis again. by SiegeLord · Pull Request #33450 · rust-lang/rust

SiegeLord · 2016-05-06T05:02:22Z

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

Fixes#33231.

rust-highfive · 2016-05-06T05:02:36Z

r? @nrc

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

nrc · 2016-05-08T06:08:55Z

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

nrc · 2016-05-08T06:10:01Z

lgtm, r+ with the name changed

nrc · 2016-05-09T04:36:39Z

@bors: r+

bors · 2016-05-09T04:36:40Z

📌 Commit 5ec8e92 has been approved by nrc

bors · 2016-05-09T09:13:25Z

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

bors · 2016-05-09T10:14:55Z

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

SiegeLord · 2016-05-09T15:32:53Z

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

bors · 2016-05-10T06:53:15Z

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

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

SiegeLord · 2016-05-11T02:24:05Z

Re-based onto master.

nrc · 2016-05-11T19:12:46Z

@bors: r+

bors · 2016-05-11T19:12:47Z

📌 Commit ba04a52 has been approved by nrc

oli-obk · 2016-05-12T12:03:53Z

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 · 2016-05-12T13:26:58Z

⌛ Testing commit ba04a52 with merge 487dffe...

eddyb · 2016-05-12T14:08:04Z

@bors r-

bors · 2016-05-12T14:11:02Z

⛄ The build was interrupted to prioritize another pull request.

SiegeLord · 2016-05-12T16:01:16Z

::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 · 2016-05-12T16:33:48Z

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

eddyb · 2016-05-12T16:53:17Z

@bors r=nrc

bors · 2016-05-12T16:53:17Z

📌 Commit 215b260 has been approved by nrc

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. Fixesrust-lang#33231.

Rollup of 23 pull requests - Successful merges: #33282, #33342, #33393, #33450, #33513, #33517, #33531, #33532, #33533, #33534, #33538, #33541, #33544, #33552, #33555, #33560, #33563, #33565, #33566, #33572, #33580, #33590, #33596 - Failed merges: #33578

bors · 2016-05-13T02:52:51Z

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

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 · 2016-05-13T06:57:11Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

rust-highfive assigned nrc May 6, 2016

nrc reviewed May 8, 2016
View reviewed changes

SiegeLordEx added 5 commits May 10, 2016 08:21

Make --emit dep-info work correctly with -Z no-analysis again.
f16eac9
Previously, it would attempt to resolve some external crates that weren't necessary for dep-info output. Fixesrust-lang#33231.

Fix funky formatting.
105aa8c

Rename after_ast to after_hir_lowering.
64cca3a

Make the dep-info-no-analysis regex more robust on Windows.
a75fc0d

Also rename the print_from_ast.
ba04a52

SiegeLord force-pushed the dep_info_no_analysis branch from 8687aa8 to ba04a52Compare May 11, 2016 02:23

Manishearth mentioned this pull request May 12, 2016
Rollup of 11 pull requests #33582
Closed

Fix the sed invocation to also work with BSD sed.
215b260

eddyb mentioned this pull request May 12, 2016
Rollup of 21 pull requests #33595
Closed

eddyb mentioned this pull request May 12, 2016
Rollup of 23 pull requests #33597
Closed

eddyb mentioned this pull request May 13, 2016
Rollup of 29 pull requests #33610
Closed

bors merged commit 215b260 into rust-lang:masterMay 13, 2016

jseyfried mentioned this pull request Jun 10, 2016
Rustc dumping AST in json fails on nightly #33796
Closed

Uh oh!

Uh oh!

Conversation

SiegeLord commented May 6, 2016

Uh oh!

rust-highfive commented May 6, 2016

Uh oh!

nrcMay 8, 2016

Choose a reason for hiding this comment

Uh oh!

SiegeLordMay 8, 2016

Choose a reason for hiding this comment

Uh oh!

nrc commented May 8, 2016

Uh oh!

nrc commented May 9, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

SiegeLord commented May 9, 2016

Uh oh!

bors commented May 10, 2016

Uh oh!

SiegeLord commented May 11, 2016

Uh oh!

nrc commented May 11, 2016

Uh oh!

bors commented May 11, 2016

Uh oh!

oli-obk commented May 12, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented May 12, 2016

Uh oh!

eddyb commented May 12, 2016

Uh oh!

bors commented May 12, 2016

Uh oh!

SiegeLord commented May 12, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SiegeLord commented May 12, 2016

Uh oh!

eddyb commented May 12, 2016

Uh oh!

bors commented May 12, 2016

Uh oh!

bors commented May 13, 2016

Uh oh!

bors commented May 13, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

oli-obk commented May 12, 2016•
edited
Loading

SiegeLord commented May 12, 2016•
edited
Loading