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

Run rustfmt on libcore/sync folder #37218

Merged
merged 1 commit into from
Oct 19, 2016
Merged

Run rustfmt on libcore/sync folder #37218

merged 1 commit into from
Oct 19, 2016

Conversation

srinivasreddy
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@srinivasreddy
Copy link
Contributor Author

srinivasreddy commented Oct 16, 2016

@nrc This looks good to me. let's merge it. r?@nrc

@rust-highfive rust-highfive assigned nrc and unassigned aturon Oct 16, 2016
unsafe { atomic_store(self.v.get(), val as u8, order); }
unsafe {
atomic_store(self.v.get(), val as u8, order);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Hm, why does rustfmt put this on multiple lines...

unsafe {
atomic_load(self.p.get() as *mut usize, order) as *mut T
}
unsafe { atomic_load(self.p.get() as *mut usize, order) as *mut T }
Copy link
Contributor

Choose a reason for hiding this comment

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

...but this on a single line?

Copy link
Contributor

Choose a reason for hiding this comment

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

Semicolon versus no semicolon? rustfmt appears to avoid ; }.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, Rustfmt puts blocks which are expressions on one line, but not blocks of statements (even if just one)

@nrc
Copy link
Member

nrc commented Oct 17, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 17, 2016

📌 Commit 5afd6d8 has been approved by nrc

eddyb added a commit to eddyb/rust that referenced this pull request Oct 19, 2016
eddyb added a commit to eddyb/rust that referenced this pull request Oct 19, 2016
bors added a commit that referenced this pull request Oct 19, 2016
@bors bors merged commit 5afd6d8 into rust-lang:master Oct 19, 2016
@srinivasreddy srinivasreddy deleted the sync branch October 19, 2016 16:01
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.

7 participants