Skip to content

Commit f3f038c

Browse files
committed
Allow trailing commas in bitflags! macro
1 parent 4a5a9c5 commit f3f038c

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/libstd/bitflags.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
//! static FlagC = 0x00000100,
2525
//! static FlagABC = FlagA.bits
2626
//! | FlagB.bits
27-
//! | FlagC.bits
27+
//! | FlagC.bits,
2828
//! }
2929
//! )
3030
//!
@@ -46,7 +46,7 @@
4646
//! bitflags!(
4747
//! flags Flags: u32 {
4848
//! static FlagA = 0x00000001,
49-
//! static FlagB = 0x00000010
49+
//! static FlagB = 0x00000010,
5050
//! }
5151
//! )
5252
//!
@@ -215,7 +215,17 @@ macro_rules! bitflags(
215215
$BitFlags { bits: !self.bits } & $BitFlags::all()
216216
}
217217
}
218-
)
218+
);
219+
($(#[$attr:meta])* flags $BitFlags:ident: $T:ty {
220+
$($(#[$Flag_attr:meta])* static $Flag:ident = $value:expr),+,
221+
}) => (
222+
bitflags!(
223+
$(#[$attr])*
224+
flags $BitFlags: u32 {
225+
$($(#[$Flag_attr])* static $Flag = $value),+
226+
}
227+
)
228+
);
219229
)
220230

221231
#[cfg(test)]
@@ -231,7 +241,7 @@ mod tests {
231241
static FlagC = 0x00000100,
232242
static FlagABC = FlagA.bits
233243
| FlagB.bits
234-
| FlagC.bits
244+
| FlagC.bits,
235245
}
236246
)
237247

0 commit comments

Comments
 (0)