Skip to content
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.

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

Some various bits of cleanup #661

Merged
merged 6 commits into from
Jan 26, 2021
Merged

Some various bits of cleanup #661

merged 6 commits into from
Jan 26, 2021

Conversation

jackh726
Copy link
Member

@jackh726 jackh726 commented Dec 6, 2020

  • Remove the InferenceTable-like traits in engine and recursive
  • In chalk-engine, do some refactoring around Strand
    • Pass around CanonicalStrand almost everywhere and instantiate as-needed
    • Make Strand not have the InferenceTable and make CanonicalStrand just Canonical<Strand>
  • Make Variances share more code with other slice interners

@bors
Copy link
Contributor

bors commented Dec 10, 2020

☔ The latest upstream changes (presumably #624) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@bors
Copy link
Contributor

bors commented Jan 8, 2021

☔ The latest upstream changes (presumably #674) made this pull request unmergeable. Please resolve the merge conflicts.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 26, 2021

📌 Commit 17512fc has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Jan 26, 2021

⌛ Testing commit 17512fc with merge 9332c49...

@bors
Copy link
Contributor

bors commented Jan 26, 2021

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 9332c49 to master...

@bors bors merged commit 9332c49 into rust-lang:master Jan 26, 2021
@jackh726 jackh726 deleted the cleanup branch January 26, 2021 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants