mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pacify the merciless nrc.

Browse Source
This commit is contained in:
Niko Matsakis 2015-02-11 16:55:22 -05:00
parent eec3b431aa
commit a25ed227a7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/metadata/csearch.rs
View File

@ -234,7 +234,7 @@ pub fn get_trait_def<'tcx>(tcx: &ty::ctxt<'tcx>, def: ast::DefId) -> ty::TraitDe
}
pub fn get_predicates<'tcx>(tcx: &ty::ctxt<'tcx>, def: ast::DefId)
-> ty::GenericPredicates<'tcx>
-> ty::GenericPredicates<'tcx>
{
let cstore = &tcx.sess.cstore;
let cdata = cstore.get_crate_data(def.krate);

6
src/librustc/metadata/decoder.rs
View File

@ -418,9 +418,9 @@ pub fn get_trait_def<'tcx>(cdata: Cmd,
}
pub fn get_predicates<'tcx>(cdata: Cmd,
item_id: ast::NodeId,
tcx: &ty::ctxt<'tcx>)
-> ty::GenericPredicates<'tcx>
item_id: ast::NodeId,
tcx: &ty::ctxt<'tcx>)
-> ty::GenericPredicates<'tcx>
{
let item_doc = lookup_item(item_id, cdata.data());
doc_predicates(item_doc, tcx, cdata, tag_item_generics)

14
src/librustc_typeck/collect.rs
View File

@ -44,7 +44,7 @@ Converting types can require:
So as you can see, in general translating types requires knowing the
trait hierarchy. But this gets a bit tricky because translating the
trait hierarchy requires convering the types that appear in trait
trait hierarchy requires converting the types that appear in trait
references. One potential saving grace is that in general knowing the
trait hierarchy is only necessary for shorthands like `T::X` or
handling omitted lifetime bounds on object types. Therefore, if we are
@ -1778,12 +1778,12 @@ fn check_method_self_type<'a, 'tcx, RS:RegionScope>(
&ty::liberate_late_bound_regions(
tcx, body_scope, &ty::Binder(base_type)));
//debug!("required_type={} required_type_free={} \
//base_type={} base_type_free={}",
//required_type.repr(tcx),
//required_type_free.repr(tcx),
//base_type.repr(tcx),
//base_type_free.repr(tcx));
debug!("required_type={} required_type_free={} \
base_type={} base_type_free={}",
required_type.repr(tcx),
required_type_free.repr(tcx),
base_type.repr(tcx),
base_type_free.repr(tcx));
let infcx = infer::new_infer_ctxt(tcx);
drop(::require_same_types(tcx,