Skip to content

Commit 31f6534

Browse files
committed
libsyntax: Add explicit self to ast_util. rs=explicit-selfing
1 parent 9556629 commit 31f6534

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

src/libsyntax/ast_util.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -298,38 +298,38 @@ pub pure fn struct_field_visibility(field: ast::struct_field) -> visibility {
298298
}
299299

300300
pub trait inlined_item_utils {
301-
fn ident() -> ident;
302-
fn id() -> ast::node_id;
303-
fn accept<E>(e: E, v: visit::vt<E>);
301+
fn ident(&self) -> ident;
302+
fn id(&self) -> ast::node_id;
303+
fn accept<E>(&self, e: E, v: visit::vt<E>);
304304
}
305305

306306
pub impl inlined_item: inlined_item_utils {
307-
fn ident() -> ident {
308-
match self {
309-
ii_item(i) => /* FIXME (#2543) */ copy i.ident,
310-
ii_foreign(i) => /* FIXME (#2543) */ copy i.ident,
311-
ii_method(_, m) => /* FIXME (#2543) */ copy m.ident,
312-
ii_dtor(_, nm, _, _) => /* FIXME (#2543) */ copy nm
307+
fn ident(&self) -> ident {
308+
match *self {
309+
ii_item(i) => /* FIXME (#2543) */ copy i.ident,
310+
ii_foreign(i) => /* FIXME (#2543) */ copy i.ident,
311+
ii_method(_, m) => /* FIXME (#2543) */ copy m.ident,
312+
ii_dtor(_, nm, _, _) => /* FIXME (#2543) */ copy nm
313313
}
314314
}
315315

316-
fn id() -> ast::node_id {
317-
match self {
318-
ii_item(i) => i.id,
319-
ii_foreign(i) => i.id,
320-
ii_method(_, m) => m.id,
321-
ii_dtor(ref dtor, _, _, _) => (*dtor).node.id
316+
fn id(&self) -> ast::node_id {
317+
match *self {
318+
ii_item(i) => i.id,
319+
ii_foreign(i) => i.id,
320+
ii_method(_, m) => m.id,
321+
ii_dtor(ref dtor, _, _, _) => (*dtor).node.id
322322
}
323323
}
324324

325-
fn accept<E>(e: E, v: visit::vt<E>) {
326-
match self {
327-
ii_item(i) => (v.visit_item)(i, e, v),
328-
ii_foreign(i) => (v.visit_foreign_item)(i, e, v),
329-
ii_method(_, m) => visit::visit_method_helper(m, e, v),
330-
ii_dtor(ref dtor, _, tps, parent_id) => {
325+
fn accept<E>(&self, e: E, v: visit::vt<E>) {
326+
match *self {
327+
ii_item(i) => (v.visit_item)(i, e, v),
328+
ii_foreign(i) => (v.visit_foreign_item)(i, e, v),
329+
ii_method(_, m) => visit::visit_method_helper(m, e, v),
330+
ii_dtor(ref dtor, _, tps, parent_id) => {
331331
visit::visit_struct_dtor_helper((*dtor), tps, parent_id, e, v);
332-
}
332+
}
333333
}
334334
}
335335
}

0 commit comments

Comments
 (0)