Skip to content

Refactor supertrait handling #23026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 5, 2015
Merged

Refactor supertrait handling #23026

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba1b5ee
Simplify impl of Elaborator now that we don't need stack traces anymore.
nikomatsakis Feb 23, 2015
4dfa81f
Extract out the `filter_to_traits` functionality
nikomatsakis Feb 23, 2015
ab8a769
Extend the "treat-err-as-bug" option to cover calls to fatal.
nikomatsakis Mar 4, 2015
4ee002a
Extract out trait_defines_associated_type_named into the AstConv
nikomatsakis Mar 4, 2015
bc9ae36
Separate supertrait collection from processing a `TraitDef`. This allows
nikomatsakis Feb 24, 2015
cd50b4e
Generalize the code so we can handle multiple supertraits.
nikomatsakis Mar 3, 2015
1d3de19
Add tests related to #20220. Fixes #20220.
nikomatsakis Mar 3, 2015
9b332ff
Address nits by @nrc.
nikomatsakis Mar 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extract out the filter_to_traits functionality
  • Loading branch information
@nikomatsakis
nikomatsakis committed Mar 4, 2015
commit 4dfa81f6fa0132cee30a8737dbf6c712fab12928
31 changes: 22 additions & 9 deletions src/librustc/middle/traits/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ pub fn elaborate_predicates<'cx, 'tcx>(
}

impl<'cx, 'tcx> Elaborator<'cx, 'tcx> {
pub fn filter_to_traits(self) -> Supertraits<'cx, 'tcx> {
Supertraits { elaborator: self }
pub fn filter_to_traits(self) -> JustTraits<Elaborator<'cx, 'tcx>> {
JustTraits::new(self)
}

fn push(&mut self, predicate: &ty::Predicate<'tcx>) {
Expand Down Expand Up @@ -185,11 +185,7 @@ impl<'cx, 'tcx> Iterator for Elaborator<'cx, 'tcx> {
// Supertrait iterator
///////////////////////////////////////////////////////////////////////////

/// A filter around the `Elaborator` that just yields up supertrait references,
/// not other kinds of predicates.
pub struct Supertraits<'cx, 'tcx:'cx> {
elaborator: Elaborator<'cx, 'tcx>,
}
pub type Supertraits<'cx, 'tcx> = JustTraits<Elaborator<'cx, 'tcx>>;

pub fn supertraits<'cx, 'tcx>(tcx: &'cx ty::ctxt<'tcx>,
trait_ref: ty::PolyTraitRef<'tcx>)
Expand All @@ -205,12 +201,28 @@ pub fn transitive_bounds<'cx, 'tcx>(tcx: &'cx ty::ctxt<'tcx>,
elaborate_trait_refs(tcx, bounds).filter_to_traits()
}

impl<'cx, 'tcx> Iterator for Supertraits<'cx, 'tcx> {
///////////////////////////////////////////////////////////////////////////
// Other
///////////////////////////////////////////////////////////////////////////

/// A filter around an iterator of predicates that makes it yield up
/// just trait references.
pub struct JustTraits<I> {
base_iterator: I
}

impl<I> JustTraits<I> {
fn new(base: I) -> JustTraits<I> {
JustTraits { base_iterator: base }
}
}

impl<'tcx,I:Iterator<Item=ty::Predicate<'tcx>>> Iterator for JustTraits<I> {
type Item = ty::PolyTraitRef<'tcx>;

fn next(&mut self) -> Option<ty::PolyTraitRef<'tcx>> {
loop {
match self.elaborator.next() {
match self.base_iterator.next() {
None => {
return None;
}
Expand All @@ -224,6 +236,7 @@ impl<'cx, 'tcx> Iterator for Supertraits<'cx, 'tcx> {
}
}


///////////////////////////////////////////////////////////////////////////
// Other
///////////////////////////////////////////////////////////////////////////
Expand Down