Skip to content

Reorganize rustc_front into rustc::hir. - #32570

Merged
bors merged 6 commits into
rust-lang:masterfrom
eddyb:tis-but-a-front
Apr 6, 2016
Merged

Reorganize rustc_front into rustc::hir.#32570
bors merged 6 commits into
rust-lang:masterfrom
eddyb:tis-but-a-front

Conversation

@eddyb

Copy link
Copy Markdown
Contributor

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

bors commented Mar 30, 2016

Copy link
Copy Markdown
Collaborator

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

@eddyb
eddybforce-pushed the tis-but-a-front branch 2 times, most recently from de55fa3 to 1e0df19CompareMarch 31, 2016 15:20
@bors

bors commented Mar 31, 2016

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Mar 31, 2016

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Apr 2, 2016

Copy link
Copy Markdown
Collaborator

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

@nikomatsakisnikomatsakis self-assigned this Apr 2, 2016
Comment threadmk/crates.mk Outdated

Copy link
Copy Markdown
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

bors commented Apr 2, 2016

Copy link
Copy Markdown
Collaborator

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

Comment threadsrc/librustc/hir/map/mod.rs Outdated

Copy link
Copy Markdown
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
Copy Markdown
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

eddyb commented Apr 5, 2016

Copy link
Copy Markdown
ContributorAuthor

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 5, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 4364907 has been approved by nikomatsakis

@eddyb

eddyb commented Apr 6, 2016

Copy link
Copy Markdown
ContributorAuthor

@bors r=nikomatsakis

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 2c44fc4 has been approved by nikomatsakis

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

⛄ The build was interrupted to prioritize another pull request.

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

⛄ The build was interrupted to prioritize another pull request.

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2c44fc4 with merge eb8f158...

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

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

@eddyb

eddyb commented Apr 6, 2016

Copy link
Copy Markdown
ContributorAuthor

@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

eddyb commented Apr 6, 2016

Copy link
Copy Markdown
ContributorAuthor

@bors r=nikomatsakis

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit e8a8dfb has been approved by nikomatsakis

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e8a8dfb with merge 2f4aef4...

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

⛄ The build was interrupted to prioritize another pull request.

@bors

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Apr 6, 2016

Copy link
Copy Markdown
Collaborator

⛄ The build was interrupted to prioritize another pull request.

Sign up for freeto 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

@eddyb@bors@nikomatsakis@nagisa