refactor occurs check into a folder about chalk

[fabric-and-ink]

Working on it.

[fabric-and-ink]

Slow but steady progress... :)

[scalexm]

@fabric-and-ink niko is not extremely available right now, but I'll try to help you soon :)

[scalexm]

@fabric-and-ink How about:

pub struct FolderRef<'f, F> where F: 'f + ?Sized {
    folder: &'f mut F,
}

impl<'f, F: ?Sized> FolderRef<'f, F> {
    pub fn new(folder: &'f mut F) -> Self {
        FolderRef {
            folder,
        }
    }
}

impl<'f, F: Folder + ?Sized> Folder for FolderRef<'f, F> {
    fn fold_ty(&mut self, ty: &Ty, binders: usize) -> Result<Ty> {
        self.folder.fold_ty(ty, binders)
    }

    fn fold_lifetime(&mut self, lifetime: &Lifetime, binders: usize) -> Result<Lifetime> {
        self.folder.fold_lifetime(lifetime, binders)
    }
}

and then you use it like that:

impl<T: Fold> Fold for Shifted<T> {
    type Result = T::Result;

    fn fold_with(&self, folder: &mut Folder, binders: usize) -> Result<Self::Result> {
        // I... think this is right if binders is not zero, but not sure,
        // and don't care to think about it.
        assert_eq!(binders, 0);

        // First up-shift any variables. i.e., if `self.value`
        // contains a free var with index 0, and `self.adjustment ==
        // 2`, we will translate it to a free var with index 2; then
        // we will fold *that* through `folder`.
        let mut new_folder = (Shifter::new(self.adjustment), FolderRef::new(folder));
        self.value.fold_with(&mut new_folder, binders)
    }
}

With that I think you should be good :)

[nikomatsakis]

@fabric-and-ink cool, feel free to come to gitter channel with questions, if any arise

[fabric-and-ink]

I followed your suggestion to implement a bridge trait. Now I am stuck at connecting both kinds of folders at this point:

    fn fold_lifetime(&mut self, lifetime: &Lifetime, binders: usize) -> Result<Lifetime> {
        match *lifetime {
            Lifetime::Var(ref var) => self.fold_free_lifetime_var(*var, binders),
            Lifetime::ForAll(universe_index) => {
                unimplemented!();
            },
        }
    }

I don't know what a universe is in this context (see #51) and therefore don't now how to proceed. Any hints? :)

[nikomatsakis]

@fabric-and-ink sorry, missed these comments! Maybe post your branch somewhere I can see it?

[fabric-and-ink]

There you go: https://github.com/fabric-and-ink/chalk/commit/649689f2c5843a59ef941316e11641de78c6be13

Nevermind, I got it. 🤦‍

[fabric-and-ink]

Replaced the old Folder trait (now FolderVar) with the new Folder. Now I am at this point. The "bridge" impl and the impl for Folder + ?Sized ... are in conflict. But the second impl is necessary to make for example this work.

[fabric-and-ink]

@nikomatsakis any hints on how to solve the trait conflict? (See last comment.)

[fabric-and-ink]

Nice! Thank you! That worked well :)