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

Remove delayed literals #270

Merged
merged 4 commits into from Oct 29, 2019

Conversation

@jackh726
Copy link
Contributor

jackh726 commented Oct 28, 2019

Currently based on #264, but I can change that to master instead if this should land first.

Closes #79
Closes #250

@nikomatsakis

This comment has been minimized.

Copy link
Collaborator

nikomatsakis commented Oct 28, 2019

@jackh726 #264 is merged, maybe rebase?

@jackh726 jackh726 force-pushed the jackh726:no_delayed_literal branch from 327694b to fdf9ade Oct 28, 2019
@jackh726

This comment has been minimized.

Copy link
Contributor Author

jackh726 commented Oct 28, 2019

@jackh726 jackh726 force-pushed the jackh726:no_delayed_literal branch from fdf9ade to 9cf957a Oct 29, 2019
@jackh726 jackh726 force-pushed the jackh726:no_delayed_literal branch from 9cf957a to 1043a38 Oct 29, 2019
@jackh726

This comment has been minimized.

Copy link
Contributor Author

jackh726 commented Oct 29, 2019

@nikomatsakis rebased again to current master

chalk-engine/src/logic.rs Outdated Show resolved Hide resolved
jackh726 added 2 commits Oct 29, 2019
…o remove all the `mark_strands_as_ambiguous` logic. Propagate out any detected negative cycles up to `force_answers` and `peek_answer`. These could later be changed to propagate out of chalk-engine if needed.
Copy link
Collaborator

nikomatsakis left a comment

Nice! A few suggestions.

chalk-engine/src/forest.rs Show resolved Hide resolved
chalk-engine/src/lib.rs Outdated Show resolved Hide resolved
src/test/slg.rs Outdated Show resolved Hide resolved
src/test/slg.rs Outdated Show resolved Hide resolved
src/test/slg.rs Outdated Show resolved Hide resolved
src/test/slg.rs Outdated Show resolved Hide resolved
src/test/slg.rs Outdated Show resolved Hide resolved
@nikomatsakis nikomatsakis merged commit ef45646 into rust-lang:master Oct 29, 2019
1 check passed
1 check passed
Travis CI - Pull Request Build Passed
Details
@jackh726 jackh726 deleted the jackh726:no_delayed_literal branch Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.