diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-08-06 17:14:32 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-08-07 12:23:43 -0700 |
| commit | 2772b2e5c7f85e230bcae13c49eb1386afc6cd0e (patch) | |
| tree | 6161076f339dc2adeffcfbc8bcb6e86882b7b16d /src/libsyntax/attr.rs | |
| parent | abf4421e7c2fce4e768eb20c126989501081f4f9 (diff) | |
| download | rust-2772b2e5c7f85e230bcae13c49eb1386afc6cd0e.tar.gz rust-2772b2e5c7f85e230bcae13c49eb1386afc6cd0e.zip | |
syntax: Make match arm parsing more restrictive again
Require comma separators for all expression types except the plain block
Diffstat (limited to 'src/libsyntax/attr.rs')
| -rw-r--r-- | src/libsyntax/attr.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 0838a1a70d9..65c2e00faca 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -130,7 +130,7 @@ fn get_meta_item_value_str(meta: @ast::meta_item) -> option<@~str> { ast::meta_name_value(_, v) => match v.node { ast::lit_str(s) => option::some(s), _ => option::none - } + }, _ => option::none } } @@ -207,11 +207,11 @@ fn eq(a: @ast::meta_item, b: @ast::meta_item) -> bool { ast::meta_word(na) => match b.node { ast::meta_word(nb) => na == nb, _ => false - } + }, ast::meta_name_value(na, va) => match b.node { ast::meta_name_value(nb, vb) => na == nb && va.node == vb.node, _ => false - } + }, ast::meta_list(na, la) => { // ~[Fixme-sorting] @@ -257,7 +257,7 @@ fn last_meta_item_value_str_by_name( some(item) => match attr::get_meta_item_value_str(item) { some(value) => some(value), none => none - } + }, none => none } } |
