Skip to content

Commit 63635dc

Browse files
committed
Remove use of 'ref'
1 parent 74c36c6 commit 63635dc

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

src/fallback.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ impl fmt::Display for TokenStream {
9393
write!(f, " ")?;
9494
}
9595
joint = false;
96-
match *tt {
97-
TokenTree::Group(ref tt) => {
96+
match tt {
97+
TokenTree::Group(tt) => {
9898
let (start, end) = match tt.delimiter() {
9999
Delimiter::Parenthesis => ("(", ")"),
100100
Delimiter::Brace => ("{", "}"),
@@ -107,15 +107,15 @@ impl fmt::Display for TokenStream {
107107
write!(f, "{} {} {}", start, tt.stream(), end)?
108108
}
109109
}
110-
TokenTree::Ident(ref tt) => write!(f, "{}", tt)?,
111-
TokenTree::Punct(ref tt) => {
110+
TokenTree::Ident(tt) => write!(f, "{}", tt)?,
111+
TokenTree::Punct(tt) => {
112112
write!(f, "{}", tt.as_char())?;
113113
match tt.spacing() {
114114
Spacing::Alone => {}
115115
Spacing::Joint => joint = true,
116116
}
117117
}
118-
TokenTree::Literal(ref tt) => write!(f, "{}", tt)?,
118+
TokenTree::Literal(tt) => write!(f, "{}", tt)?,
119119
}
120120
}
121121

src/lib.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -468,11 +468,11 @@ impl TokenTree {
468468
/// Returns the span of this tree, delegating to the `span` method of
469469
/// the contained token or a delimited stream.
470470
pub fn span(&self) -> Span {
471-
match *self {
472-
TokenTree::Group(ref t) => t.span(),
473-
TokenTree::Ident(ref t) => t.span(),
474-
TokenTree::Punct(ref t) => t.span(),
475-
TokenTree::Literal(ref t) => t.span(),
471+
match self {
472+
TokenTree::Group(t) => t.span(),
473+
TokenTree::Ident(t) => t.span(),
474+
TokenTree::Punct(t) => t.span(),
475+
TokenTree::Literal(t) => t.span(),
476476
}
477477
}
478478

@@ -482,11 +482,11 @@ impl TokenTree {
482482
/// the span of each of the internal tokens, this will simply delegate to
483483
/// the `set_span` method of each variant.
484484
pub fn set_span(&mut self, span: Span) {
485-
match *self {
486-
TokenTree::Group(ref mut t) => t.set_span(span),
487-
TokenTree::Ident(ref mut t) => t.set_span(span),
488-
TokenTree::Punct(ref mut t) => t.set_span(span),
489-
TokenTree::Literal(ref mut t) => t.set_span(span),
485+
match self {
486+
TokenTree::Group(t) => t.set_span(span),
487+
TokenTree::Ident(t) => t.set_span(span),
488+
TokenTree::Punct(t) => t.set_span(span),
489+
TokenTree::Literal(t) => t.set_span(span),
490490
}
491491
}
492492
}
@@ -521,11 +521,11 @@ impl From<Literal> for TokenTree {
521521
/// numeric literals.
522522
impl fmt::Display for TokenTree {
523523
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
524-
match *self {
525-
TokenTree::Group(ref t) => t.fmt(f),
526-
TokenTree::Ident(ref t) => t.fmt(f),
527-
TokenTree::Punct(ref t) => t.fmt(f),
528-
TokenTree::Literal(ref t) => t.fmt(f),
524+
match self {
525+
TokenTree::Group(t) => t.fmt(f),
526+
TokenTree::Ident(t) => t.fmt(f),
527+
TokenTree::Punct(t) => t.fmt(f),
528+
TokenTree::Literal(t) => t.fmt(f),
529529
}
530530
}
531531
}
@@ -535,16 +535,16 @@ impl fmt::Debug for TokenTree {
535535
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
536536
// Each of these has the name in the struct type in the derived debug,
537537
// so don't bother with an extra layer of indirection
538-
match *self {
539-
TokenTree::Group(ref t) => t.fmt(f),
540-
TokenTree::Ident(ref t) => {
538+
match self {
539+
TokenTree::Group(t) => t.fmt(f),
540+
TokenTree::Ident(t) => {
541541
let mut debug = f.debug_struct("Ident");
542542
debug.field("sym", &format_args!("{}", t));
543543
imp::debug_span_field_if_nontrivial(&mut debug, t.span().inner);
544544
debug.finish()
545545
}
546-
TokenTree::Punct(ref t) => t.fmt(f),
547-
TokenTree::Literal(ref t) => t.fmt(f),
546+
TokenTree::Punct(t) => t.fmt(f),
547+
TokenTree::Literal(t) => t.fmt(f),
548548
}
549549
}
550550
}

tests/test.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ fn span_test() {
190190
assert_eq!(end.column, ecol, "ecol did not match for {}", i);
191191

192192
match i {
193-
TokenTree::Group(ref g) => {
193+
TokenTree::Group(g) => {
194194
check_spans_internal(g.stream().clone(), lines);
195195
}
196196
_ => {}
@@ -289,28 +289,28 @@ fn tricky_doc_comment() {
289289
let stream = "/// doc".parse::<TokenStream>().unwrap();
290290
let tokens = stream.into_iter().collect::<Vec<_>>();
291291
assert!(tokens.len() == 2, "not length 2 -- {:?}", tokens);
292-
match tokens[0] {
293-
TokenTree::Punct(ref tt) => assert_eq!(tt.as_char(), '#'),
292+
match &tokens[0] {
293+
TokenTree::Punct(tt) => assert_eq!(tt.as_char(), '#'),
294294
_ => panic!("wrong token {:?}", tokens[0]),
295295
}
296-
let mut tokens = match tokens[1] {
297-
TokenTree::Group(ref tt) => {
296+
let mut tokens = match &tokens[1] {
297+
TokenTree::Group(tt) => {
298298
assert_eq!(tt.delimiter(), Delimiter::Bracket);
299299
tt.stream().into_iter()
300300
}
301301
_ => panic!("wrong token {:?}", tokens[0]),
302302
};
303303

304304
match tokens.next().unwrap() {
305-
TokenTree::Ident(ref tt) => assert_eq!(tt.to_string(), "doc"),
305+
TokenTree::Ident(tt) => assert_eq!(tt.to_string(), "doc"),
306306
t => panic!("wrong token {:?}", t),
307307
}
308308
match tokens.next().unwrap() {
309-
TokenTree::Punct(ref tt) => assert_eq!(tt.as_char(), '='),
309+
TokenTree::Punct(tt) => assert_eq!(tt.as_char(), '='),
310310
t => panic!("wrong token {:?}", t),
311311
}
312312
match tokens.next().unwrap() {
313-
TokenTree::Literal(ref tt) => {
313+
TokenTree::Literal(tt) => {
314314
assert_eq!(tt.to_string(), "\" doc\"");
315315
}
316316
t => panic!("wrong token {:?}", t),

0 commit comments

Comments
 (0)