about summary refs log tree commit diff
path: root/src/libstd/bitflags.rs
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-09-04 16:35:06 +1000
committerBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-09-05 03:33:00 +1000
commitef354d850e516e7005da050f0b5b8d3a5c2d7f45 (patch)
tree1212dfee9c8d0ab49492b506fbdb457da3dcc1e2 /src/libstd/bitflags.rs
parentff72583891f67b9d739b76e914519631413ee56c (diff)
downloadrust-ef354d850e516e7005da050f0b5b8d3a5c2d7f45.tar.gz
rust-ef354d850e516e7005da050f0b5b8d3a5c2d7f45.zip
Use {} for bitflags! definition and invocations
This looks nicer because it reflects Rust's other syntactic structures.
Diffstat (limited to 'src/libstd/bitflags.rs')
-rw-r--r--src/libstd/bitflags.rs28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/libstd/bitflags.rs b/src/libstd/bitflags.rs
index f540398fcaa..3d1bc20cca4 100644
--- a/src/libstd/bitflags.rs
+++ b/src/libstd/bitflags.rs
@@ -22,7 +22,7 @@
 /// # Example
 ///
 /// ~~~rust
-/// bitflags!(
+/// bitflags! {
 ///     flags Flags: u32 {
 ///         static FlagA       = 0x00000001,
 ///         static FlagB       = 0x00000010,
@@ -31,7 +31,7 @@
 ///                            | FlagB.bits
 ///                            | FlagC.bits,
 ///     }
-/// )
+/// }
 ///
 /// fn main() {
 ///     let e1 = FlagA | FlagC;
@@ -48,12 +48,12 @@
 /// ~~~rust
 /// use std::fmt;
 ///
-/// bitflags!(
+/// bitflags! {
 ///     flags Flags: u32 {
 ///         static FlagA   = 0x00000001,
 ///         static FlagB   = 0x00000010,
 ///     }
-/// )
+/// }
 ///
 /// impl Flags {
 ///     pub fn clear(&mut self) {
@@ -110,10 +110,10 @@
 /// - `insert`: inserts the specified flags in-place
 /// - `remove`: removes the specified flags in-place
 #[macro_export]
-macro_rules! bitflags(
+macro_rules! bitflags {
     ($(#[$attr:meta])* flags $BitFlags:ident: $T:ty {
         $($(#[$Flag_attr:meta])* static $Flag:ident = $value:expr),+
-    }) => (
+    }) => {
         #[deriving(PartialEq, Eq, Clone, PartialOrd, Ord, Hash)]
         $(#[$attr])*
         pub struct $BitFlags {
@@ -216,18 +216,18 @@ macro_rules! bitflags(
                 $BitFlags { bits: !self.bits } & $BitFlags::all()
             }
         }
-    );
+    };
     ($(#[$attr:meta])* flags $BitFlags:ident: $T:ty {
         $($(#[$Flag_attr:meta])* static $Flag:ident = $value:expr),+,
-    }) => (
-        bitflags!(
+    }) => {
+        bitflags! {
             $(#[$attr])*
             flags $BitFlags: u32 {
                 $($(#[$Flag_attr])* static $Flag = $value),+
             }
-        )
-    );
-)
+        }
+    };
+}
 
 #[cfg(test)]
 mod tests {
@@ -235,7 +235,7 @@ mod tests {
     use option::{Some, None};
     use ops::{BitOr, BitAnd, Sub, Not};
 
-    bitflags!(
+    bitflags! {
         #[doc = "> The first principle is that you must not fool yourself — and"]
         #[doc = "> you are the easiest person to fool."]
         #[doc = "> "]
@@ -252,7 +252,7 @@ mod tests {
                                | FlagB.bits
                                | FlagC.bits,
         }
-    )
+    }
 
     #[test]
     fn test_bits(){