Skip to content

Commit 4762a96

Browse files
committed
---
yaml --- r: 187095 b: refs/heads/try c: 47e749e h: refs/heads/master i: 187093: 4f1042f 187091: 359adb7 187087: 810d0fa v: v3
1 parent feed1ef commit 4762a96

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
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: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: d316a34ec2cfb983dbfa1458678accc49a6156ad
5+
refs/heads/try: 47e749e5be33e62058f6209aa33460c51ab54f92
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libsyntax/ext/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ foo_module!();
19801980
// the xx binding should bind all of the xx varrefs:
19811981
for (idx,v) in varrefs.iter().filter(|p| {
19821982
p.segments.len() == 1
1983-
&& "xx" == &token::get_ident(p.segments[0].identifier)
1983+
&& "xx" == &*token::get_ident(p.segments[0].identifier)
19841984
}).enumerate() {
19851985
if mtwt::resolve(v.segments[0].identifier) != resolved_binding {
19861986
println!("uh oh, xx binding didn't match xx varref:");

branches/try/src/libsyntax/parse/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -827,19 +827,19 @@ mod test {
827827
ast::TtDelimited(_, ref macro_delimed)]
828828
if name_macro_rules.as_str() == "macro_rules"
829829
&& name_zip.as_str() == "zip" => {
830-
match &macro_delimed.tts {
830+
match &macro_delimed.tts[..] {
831831
[ast::TtDelimited(_, ref first_delimed),
832832
ast::TtToken(_, token::FatArrow),
833833
ast::TtDelimited(_, ref second_delimed)]
834834
if macro_delimed.delim == token::Paren => {
835-
match &first_delimed.tts {
835+
match &first_delimed.tts[..] {
836836
[ast::TtToken(_, token::Dollar),
837837
ast::TtToken(_, token::Ident(name, token::Plain))]
838838
if first_delimed.delim == token::Paren
839839
&& name.as_str() == "a" => {},
840840
_ => panic!("value 3: {:?}", **first_delimed),
841841
}
842-
match &second_delimed.tts {
842+
match &second_delimed.tts[..] {
843843
[ast::TtToken(_, token::Dollar),
844844
ast::TtToken(_, token::Ident(name, token::Plain))]
845845
if second_delimed.delim == token::Paren
@@ -1207,7 +1207,7 @@ mod test {
12071207

12081208
let source = "/// doc comment\r\n/// line 2\r\nfn foo() {}".to_string();
12091209
let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap();
1210-
let docs = item.attrs.iter().filter(|a| &a.name() == "doc")
1210+
let docs = item.attrs.iter().filter(|a| &*a.name() == "doc")
12111211
.map(|a| a.value_str().unwrap().to_string()).collect::<Vec<_>>();
12121212
let b: &[_] = &["/// doc comment".to_string(), "/// line 2".to_string()];
12131213
assert_eq!(&docs[..], b);

0 commit comments

Comments
 (0)