Skip to content

Commit 74a5bee

Browse files
committed
---
yaml --- r: 115485 b: refs/heads/try c: c00d8fd h: refs/heads/master i: 115483: 8c7346a v: v3
1 parent c56da2f commit 74a5bee

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: bee4e6adac17f87b1cdc26ab69f8c0f5d82575a3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
5-
refs/heads/try: b733df0fc7942aea205d8fc451d2a4d17d47dfe9
5+
refs/heads/try: c00d8fd9a07244a13d1cc7162a80c3d618935ce8
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/bitflags.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ macro_rules! bitflags(
127127
self.bits
128128
}
129129

130+
/// Convert from underlying bit representation. Unsafe because the
131+
/// bits are not guaranteed to represent valid flags.
132+
pub unsafe fn from_bits(bits: $T) -> $BitFlags {
133+
$BitFlags { bits: bits }
134+
}
135+
130136
/// Returns `true` if no flags are currently stored.
131137
pub fn is_empty(&self) -> bool {
132138
*self == $BitFlags::empty()

0 commit comments

Comments
 (0)