user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

syntax: rename TypeMethod to MethodSig and use it in MethDecl.

Browse source
This commit is contained in:
Eduard Burtescu 2015-03-11 08:38:27 +02:00
parent f98b176314
commit ce10fa8d12
28 changed files with 288 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/metadata/encoder.rs
View file

@ -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(..) => {

2
src/librustc/middle/effect.rs
View file

@ -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),
};

20
src/librustc/middle/infer/error_reporting.rs
View file

@ -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,

4
src/librustc/middle/reachable.rs
View file

@ -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 {

2
src/librustc/middle/resolve_lifetime.rs
View file

@ -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)
})
}