Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Run rustfmt on liballoc_system. #28989

Merged
merged 1 commit into from
Oct 14, 2015
Merged

Run rustfmt on liballoc_system. #28989

merged 1 commit into from
Oct 14, 2015

Conversation

ahmedcharles
Copy link
Contributor

No description provided.

@ahmedcharles
Copy link
Contributor Author

r? @nrc

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive rust-highfive assigned nrc and unassigned alexcrichton Oct 12, 2015
if ptr.is_null() { return ptr }
let ptr = HeapAlloc(GetProcessHeap(), 0, (size + align) as SIZE_T) as *mut u8;
if ptr.is_null() {
return ptr
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we not want semicolons after returns?

Copy link
Member

Choose a reason for hiding this comment

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

We do, but rustfmt cannot do it yet.

@nrc
Copy link
Member

nrc commented Oct 13, 2015

@bors: r+ rollup

Thanks!

@bors
Copy link
Contributor

bors commented Oct 13, 2015

📌 Commit 6fb4cb6 has been approved by nrc

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Oct 13, 2015
bors added a commit that referenced this pull request Oct 14, 2015
@bors bors merged commit 6fb4cb6 into rust-lang:master Oct 14, 2015
@ahmedcharles ahmedcharles deleted the liballoc_system branch February 26, 2016 00:55
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants