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

Test case for borrowk ICE #25579 #34136

Merged
merged 3 commits into from
Jun 10, 2016

Conversation

imjacobclark
Copy link
Contributor

@imjacobclark imjacobclark commented Jun 7, 2016

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

}

fn causes_ice(mut l: &mut Sexpression)
{
Copy link
Contributor

Choose a reason for hiding this comment

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

style guide says the { needs to be on the previous line

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm. I don't agree with this in particular -- we follow various conventions in the compiler :) -- but also this is a test case, where the conventions are looser still, particularly since this is a regression test.

That said, I don't see any harm in reformatting either.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have reformatted the code above, I think it makes sense to have it indented 4 spaces and the brace on the same line as the if statment, consistent with the rest of the file anyway.

I need to resolve the failed build then hopefully this should be good to go.

@imjacobclark imjacobclark force-pushed the ice-test-case-25579 branch from 5d8bc1e to 0379493 Compare June 8, 2016 06:22
@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 8, 2016

📌 Commit 4c5f3a6 has been approved by nikomatsakis

Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 8, 2016
sanxiyn added a commit to sanxiyn/rust that referenced this pull request Jun 10, 2016
sanxiyn added a commit to sanxiyn/rust that referenced this pull request Jun 10, 2016
bors added a commit that referenced this pull request Jun 10, 2016
Rollup of 12 pull requests

- Successful merges: #34088, #34129, #34136, #34145, #34146, #34148, #34159, #34160, #34165, #34175, #34184, #34185
- Failed merges:
@bors bors merged commit 4c5f3a6 into rust-lang:master Jun 10, 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.

5 participants