OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow trailing commas in bitflags! macro

This commit is contained in:
Brendan Zabarauskas 2014-09-04 15:16:04 +10:00
parent 4a5a9c5631
commit f3f038c856
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libstd/bitflags.rs
View File

@ -24,7 +24,7 @@
//! static FlagC = 0x00000100,
//! static FlagABC = FlagA.bits
//! | FlagB.bits
//! | FlagC.bits
//! | FlagC.bits,
//! }
//! )
//!
@ -46,7 +46,7 @@
//! bitflags!(
//! flags Flags: u32 {
//! static FlagA = 0x00000001,
//! static FlagB = 0x00000010
//! static FlagB = 0x00000010,
//! }
//! )
//!
@ -215,7 +215,17 @@ 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!(
$(#[$attr])*
flags $BitFlags: u32 {
$($(#[$Flag_attr])* static $Flag = $value),+
}
)
);
)
#[cfg(test)]
@ -231,7 +241,7 @@ mod tests {
static FlagC = 0x00000100,
static FlagABC = FlagA.bits
| FlagB.bits
| FlagC.bits
| FlagC.bits,
}
)