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

Reorganize rustc_front into rustc::hir. #32570

Merged
merged 6 commits into from
Apr 6, 2016
Merged

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Mar 29, 2016

bors added a commit that referenced this pull request Mar 29, 2016
Weed out dependencies on librustc_llvm and librustc.

Found while working on #32570. cc @nikomatsakis
@bors
Copy link
Contributor

bors commented Mar 30, 2016

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

@eddyb eddyb force-pushed the tis-but-a-front branch 2 times, most recently from de55fa3 to 1e0df19 Compare March 31, 2016 15:20
@bors
Copy link
Contributor

bors commented Mar 31, 2016

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

@bors
Copy link
Contributor

bors commented Mar 31, 2016

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

@bors
Copy link
Contributor

bors commented Apr 2, 2016

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

DEPS_rustc_data_structures := std log serialize
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
rustc_typeck rustc_mir rustc_resolve log syntax serialize rustc_llvm \
rustc_trans rustc_privacy rustc_lint rustc_front rustc_plugin \
rustc_trans rustc_privacy rustc_lint rustc_plugin \
Copy link
Member

Choose a reason for hiding this comment

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

nit: alignment

EDIT: preexisting

@bors
Copy link
Contributor

bors commented Apr 2, 2016

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

if let Some(tcx) = tcx {
tcx.node_path_str(id)
} else {
let path = map.def_path_from_id(id).data;
Copy link
Contributor

Choose a reason for hiding this comment

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

Note that some node-ids do not have a def-path, right? So this might panic?

@nikomatsakis
Copy link
Contributor

This looks good to me, but I am concerned a bit about the last commit. We probably want to modify def_path_from_id to return an Option in the case that the node-id has no corresponding def-id.

@eddyb
Copy link
Member Author

eddyb commented Apr 5, 2016

@nikomatsakis It's not used for nodes without a DefId AFAICT, but I made that change anyway.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Apr 5, 2016

📌 Commit 4364907 has been approved by nikomatsakis

@eddyb
Copy link
Member Author

eddyb commented Apr 6, 2016

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 6, 2016

📌 Commit 2c44fc4 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⌛ Testing commit 2c44fc4 with merge 8be478c...

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⌛ Testing commit 2c44fc4 with merge 84c06a2...

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⌛ Testing commit 2c44fc4 with merge eb8f158...

@bors
Copy link
Contributor

bors commented Apr 6, 2016

💔 Test failed - auto-linux-musl-64-opt

@eddyb
Copy link
Member Author

eddyb commented Apr 6, 2016

@alexcrichton Above failure is legitimate but neither I, locally, nor Travis, actually hit it.
Do debuginfo tests not run if neither of gdb and lldb are installed?

@eddyb
Copy link
Member Author

eddyb commented Apr 6, 2016

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 6, 2016

📌 Commit e8a8dfb has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⌛ Testing commit e8a8dfb with merge 2f4aef4...

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⌛ Testing commit e8a8dfb with merge 4a49051...

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 6, 2016
 r? @nikomatsakis

Conflicts:
	src/librustc_save_analysis/lib.rs
	src/libsyntax/ast_util.rs
@bors
Copy link
Contributor

bors commented Apr 6, 2016

⛄ The build was interrupted to prioritize another pull request.

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.

4 participants