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

Invalid module location #41501

Merged
merged 4 commits into from
Apr 27, 2017
Merged

Conversation

GuillaumeGomez
Copy link
Member

Fixes #38110.

r? @jseyfried

@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 24, 2017
Copy link
Contributor

@jseyfried jseyfried left a comment

Choose a reason for hiding this comment

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

Thanks! r=me modulo comment.

match paths.result {
Ok(succ) => Ok(succ),
Err(err) => Err(self.span_fatal_err(id_sp, err)),
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Why this change? It looks good as is.

Copy link
Member Author

Choose a reason for hiding this comment

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

A rebase error I guess. Removing it.

@GuillaumeGomez
Copy link
Member Author

@bors: r=jseyfried

@bors
Copy link
Contributor

bors commented Apr 25, 2017

📌 Commit 3f97b2a has been approved by jseyfried

arielb1 pushed a commit to arielb1/rust that referenced this pull request Apr 25, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 26, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 26, 2017
bors added a commit that referenced this pull request Apr 26, 2017
Rollup of 7 pull requests

- Successful merges: #41370, #41447, #41456, #41493, #41499, #41501, #41550
- Failed merges:
arielb1 pushed a commit to arielb1/rust that referenced this pull request Apr 26, 2017
arielb1 pushed a commit to arielb1/rust that referenced this pull request Apr 26, 2017
bors added a commit that referenced this pull request Apr 27, 2017
Rollup of 9 pull requests

- Successful merges: #41370, #41456, #41493, #41499, #41501, #41524, #41546, #41550, #41552
- Failed merges:
@bors bors merged commit 3f97b2a into rust-lang:master Apr 27, 2017
@GuillaumeGomez GuillaumeGomez deleted the invalid_module_location branch April 27, 2017 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants