rebase formality

[nikomatsakis]

We need to rebase formality atop the latest rust-lang commit. I'm not sure what's changed.

[lqd]

rust-lang/a-mir-formality@main...nikomatsakis:a-mir-formality-ndm:main are the commits that are in your fork but not in rust-lang yet. The grammar here seems to rely on these commits to work.

[nikomatsakis]

OK :)

[lqd]

Hum, maybe this issue to try to rebase your fork and use the result here, but not upstream the commits in your fork?

[nikomatsakis]

@lqd Really the issue is to reconcile them. I think the right thing is to move the commits from my fork onto the main and then move this to use the main repo -- well, ideally, publish a 0.2 to crates.io and use that.