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

Add more capabilities to typarams bounded by traits with super-builtin-kinds. Close #7083.

Browse Source
This commit is contained in:
Ben Blum 2013-08-19 16:50:23 -04:00
parent 4ca2e55adb
commit 3c3bfb4c3c
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc/middle/ty.rs
View File

@ -2322,7 +2322,7 @@ fn type_param_def_to_contents(cx: ctxt,
let _i = indenter();
let mut tc = TC_ALL;
for bound in type_param_def.bounds.builtin_bounds.iter() {
do each_inherited_builtin_bound(cx, type_param_def.bounds) |bound| {
debug!("tc = %s, bound = %?", tc.to_str(), bound);
tc = tc - match bound {
BoundStatic => TypeContents::nonstatic(cx),
@ -2335,6 +2335,23 @@ fn type_param_def_to_contents(cx: ctxt,
debug!("result = %s", tc.to_str());
return tc;
// Iterates over all builtin bounds on the type parameter def, including
// those inherited from traits with builtin-kind-supertraits.
fn each_inherited_builtin_bound(cx: ctxt, bounds: &ParamBounds,
f: &fn(BuiltinBound)) {
for bound in bounds.builtin_bounds.iter() {
f(bound);
}
do each_bound_trait_and_supertraits(cx, bounds.trait_bounds) |trait_ref| {
let trait_def = lookup_trait_def(cx, trait_ref.def_id);
for bound in trait_def.bounds.iter() {
f(bound);
}
true
};
}
}
}