Skip to content

Commit 8fd95f9

Browse files
committed
The enum variant are now namespaced
1 parent e6fb445 commit 8fd95f9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ enum Field {
2424
impl Field {
2525
fn bit_len(&self) -> u64 {
2626
match *self {
27-
ArrayField(_, count, element_length) => (count as u64) * element_length as u64,
28-
ScalarField(_, length) => length as u64,
27+
Field::ArrayField(_, count, element_length) => (count as u64) * element_length as u64,
28+
Field::ScalarField(_, length) => length as u64,
2929
}
3030
}
3131

@@ -108,7 +108,7 @@ impl Field {
108108
fn to_methods(&self, cx: &mut ExtCtxt, start: u64) -> Vec<P<ast::Method>> {
109109
let mut methods = vec![];
110110
match *self {
111-
ArrayField(ref name, count, element_length) => {
111+
Field::ArrayField(ref name, count, element_length) => {
112112
let (element_type, value_type_length) = size_to_ty(cx, element_length).unwrap();
113113
let value_type = make_array_ty(cx, &element_type, count);
114114
let getter_name = "get_".to_string() + *name;
@@ -158,7 +158,7 @@ impl Field {
158158
methods.push(setter);
159159

160160
},
161-
ScalarField(ref name, length) => {
161+
Field::ScalarField(ref name, length) => {
162162
let (value_type, value_type_length) = size_to_ty(cx, length).unwrap();
163163
let getter_name = "get_".to_string() + *name;
164164
let getter_ident = token::str_to_ident(getter_name.as_slice());
@@ -234,7 +234,7 @@ fn parse_field(parser: &mut Parser) -> Field {
234234
parser.span_fatal(span, "Field length must be > 0");
235235
}
236236
parser.expect(&token::CloseDelim(token::Bracket));
237-
ArrayField {name: name, element_length: element_length as u8, count: count as uint}
237+
Field::ArrayField {name: name, element_length: element_length as u8, count: count as uint}
238238
}
239239
else {
240240
//ScalarField
@@ -243,7 +243,7 @@ fn parse_field(parser: &mut Parser) -> Field {
243243
let span = parser.last_span;
244244
parser.span_fatal(span, "Field length must be > 0 and <= 64");
245245
}
246-
ScalarField {name: name, length: length as u8}
246+
Field::ScalarField {name: name, length: length as u8}
247247
}
248248
}
249249

0 commit comments

Comments
 (0)