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

lower blanket unsafe block to actual cases of unsafe and adjust indents #26757

Merged
merged 1 commit into from
Jul 6, 2015

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 3, 2015

the indentation has always been a thorn in my eye.

If it's preferred I'll leave the unsafe where it was and change it to

unsafe { match e.node {
    ...
} } // unsafe { match e.node {

so there's no unnecessary indent

@rust-highfive
Copy link
Collaborator

r? @brson

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

@bors
Copy link
Contributor

bors commented Jul 4, 2015

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

@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 6, 2015

rebased

@brson
Copy link
Contributor

brson commented Jul 6, 2015

@bors r+ seems ok to me. Thanks.

@bors
Copy link
Contributor

bors commented Jul 6, 2015

📌 Commit 106f382 has been approved by brson

@bors
Copy link
Contributor

bors commented Jul 6, 2015

⌛ Testing commit 106f382 with merge 9d9e267...

bors added a commit that referenced this pull request Jul 6, 2015
the indentation has always been a thorn in my eye.

If it's preferred I'll leave the `unsafe` where it was and change it to

```rust
unsafe { match e.node {
    ...
} } // unsafe { match e.node {
```

so there's no unnecessary indent
@bors bors merged commit 106f382 into rust-lang:master Jul 6, 2015
@oli-obk oli-obk deleted the style_fixes branch July 8, 2015 15:11
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