Skip to content

Rustfmt-ing librustc_bitflags. #29032

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

Merged
merged 1 commit into from
Oct 14, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/librustc_bitflags/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@

//! A typesafe bitmask flag generator.

#[cfg(test)] #[macro_use] extern crate std;
#[cfg(test)]
#[macro_use]
extern crate std;

/// The `bitflags!` macro generates a `struct` that holds a set of C-style
/// bitmask flags. It is useful for creating typesafe wrappers for C APIs.
Expand Down Expand Up @@ -321,7 +323,7 @@ mod tests {
}

#[test]
fn test_bits(){
fn test_bits() {
assert_eq!(Flags::empty().bits(), 0b00000000);
assert_eq!(Flags::FlagA.bits(), 0b00000001);
assert_eq!(Flags::FlagABC.bits(), 0b00000111);
Expand Down Expand Up @@ -354,7 +356,7 @@ mod tests {
}

#[test]
fn test_is_empty(){
fn test_is_empty() {
assert!(Flags::empty().is_empty());
assert!(!Flags::FlagA.is_empty());
assert!(!Flags::FlagABC.is_empty());
Expand Down Expand Up @@ -413,7 +415,7 @@ mod tests {
}

#[test]
fn test_insert(){
fn test_insert() {
let mut e1 = Flags::FlagA;
let e2 = Flags::FlagA | Flags::FlagB;
e1.insert(e2);
Expand All @@ -425,7 +427,7 @@ mod tests {
}

#[test]
fn test_remove(){
fn test_remove() {
let mut e1 = Flags::FlagA | Flags::FlagB;
let e2 = Flags::FlagA | Flags::FlagC;
e1.remove(e2);
Expand Down Expand Up @@ -484,12 +486,12 @@ mod tests {

#[test]
fn test_hash() {
let mut x = Flags::empty();
let mut y = Flags::empty();
assert!(hash(&x) == hash(&y));
x = Flags::all();
y = Flags::FlagABC;
assert!(hash(&x) == hash(&y));
let mut x = Flags::empty();
let mut y = Flags::empty();
assert!(hash(&x) == hash(&y));
x = Flags::all();
y = Flags::FlagABC;
assert!(hash(&x) == hash(&y));
}

fn hash<T: Hash>(t: &T) -> u64 {
Expand Down