diff options
Diffstat (limited to 'src/librustc')
| -rw-r--r-- | src/librustc/metadata/encoder.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/effect.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/infer/error_reporting.rs | 20 | ||||
| -rw-r--r-- | src/librustc/middle/reachable.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/resolve_lifetime.rs | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index 0c220ab8766..eb41a26fa77 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -838,7 +838,7 @@ fn encode_info_for_method<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>, if !any_types { encode_symbol(ecx, rbml_w, m.def_id.node); } - encode_method_argument_names(rbml_w, ast_method.pe_fn_decl()); + encode_method_argument_names(rbml_w, &ast_method.pe_sig().decl); } } @@ -1383,7 +1383,7 @@ fn encode_info_for_item(ecx: &EncodeContext, encode_trait_item(rbml_w); encode_item_sort(rbml_w, 'p'); encode_inlined_item(ecx, rbml_w, IITraitItemRef(def_id, trait_item)); - encode_method_argument_names(rbml_w, &*m.pe_fn_decl()); + encode_method_argument_names(rbml_w, &*m.pe_sig().decl); } ast::TypeTraitItem(..) => { diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index 5b5e5b6555b..02f2908a9e6 100644 --- a/src/librustc/middle/effect.rs +++ b/src/librustc/middle/effect.rs @@ -91,7 +91,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> { visit::FkItemFn(_, _, fn_style, _) => (true, fn_style == ast::Unsafety::Unsafe), visit::FkMethod(_, method) => - (true, method.pe_unsafety() == ast::Unsafety::Unsafe), + (true, method.pe_sig().unsafety == ast::Unsafety::Unsafe), _ => (false, false), }; diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs index cf3715bc3fb..823acdc1691 100644 --- a/src/librustc/middle/infer/error_reporting.rs +++ b/src/librustc/middle/infer/error_reporting.rs @@ -841,7 +841,7 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> { ast_map::NodeItem(ref item) => { match item.node { ast::ItemFn(ref fn_decl, pur, _, ref gen, _) => { - Some((&**fn_decl, gen, pur, item.ident, None, item.span)) + Some((fn_decl, gen, pur, item.ident, None, item.span)) }, _ => None } @@ -849,11 +849,11 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> { ast_map::NodeImplItem(item) => { match item.node { ast::MethodImplItem(ref m) => { - Some((m.pe_fn_decl(), - m.pe_generics(), - m.pe_unsafety(), + Some((&m.pe_sig().decl, + &m.pe_sig().generics, + m.pe_sig().unsafety, item.ident, - Some(&m.pe_explicit_self().node), + Some(&m.pe_sig().explicit_self.node), item.span)) } ast::TypeImplItem(_) => None, @@ -862,11 +862,11 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> { ast_map::NodeTraitItem(item) => { match item.node { ast::ProvidedMethod(ref m) => { - Some((m.pe_fn_decl(), - m.pe_generics(), - m.pe_unsafety(), + Some((&m.pe_sig().decl, + &m.pe_sig().generics, + m.pe_sig().unsafety, item.ident, - Some(&m.pe_explicit_self().node), + Some(&m.pe_sig().explicit_self.node), item.span)) } _ => None @@ -1732,7 +1732,7 @@ fn lifetimes_in_scope(tcx: &ty::ctxt, ast_map::NodeImplItem(ii) => { match ii.node { ast::MethodImplItem(ref m) => { - taken.push_all(&m.pe_generics().lifetimes); + taken.push_all(&m.pe_sig().generics.lifetimes); Some(ii.id) } ast::TypeImplItem(_) => None, diff --git a/src/librustc/middle/reachable.rs b/src/librustc/middle/reachable.rs index fd6b28fd292..75e9c60698b 100644 --- a/src/librustc/middle/reachable.rs +++ b/src/librustc/middle/reachable.rs @@ -57,7 +57,7 @@ fn method_might_be_inlined(tcx: &ty::ctxt, method: &ast::Method, impl_item: &ast::ImplItem, impl_src: ast::DefId) -> bool { if attr::requests_inline(&impl_item.attrs) || - generics_require_inlining(method.pe_generics()) { + generics_require_inlining(&method.pe_sig().generics) { return true } if is_local(impl_src) { @@ -191,7 +191,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> { Some(ast_map::NodeImplItem(impl_item)) => { match impl_item.node { ast::MethodImplItem(ref method) => { - if generics_require_inlining(method.pe_generics()) || + if generics_require_inlining(&method.pe_sig().generics) || attr::requests_inline(&impl_item.attrs) { true } else { diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index e02f7861285..32d52bcbf74 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -149,7 +149,7 @@ impl<'a, 'v> Visitor<'v> for LifetimeContext<'a> { }) } visit::FkMethod(_, m) => { - self.visit_early_late(subst::FnSpace, m.pe_generics(), |this| { + self.visit_early_late(subst::FnSpace, &m.pe_sig().generics, |this| { visit::walk_fn(this, fk, fd, b, s) }) } |