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.

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

Jump to bottom

[Merged by Bors] - feat: port Data.Seq.Computation #1216

Closed
wants to merge 9 commits into from
Closed

[Merged by Bors] - feat: port Data.Seq.Computation #1216

wants to merge 9 commits into from

Conversation

arienmalec
Copy link
Collaborator

@arienmalec arienmalec commented Dec 25, 2022 •
edited

Port of data.seq.computation

Requires renaming return to pure

@arienmalec arienmalec added help-wanted The author needs attention to resolve issues mathlib-port This is a port of a theory file from mathlib. labels Dec 25, 2022
@semorrison semorrison added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Dec 26, 2022
@rwbarton rwbarton changed the title Port/data.seq.computation feat: port Data.Seq.Computation Dec 28, 2022
@arienmalec arienmalec removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Dec 29, 2022
@semorrison semorrison added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 2, 2023
@arienmalec arienmalec removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 2, 2023
@semorrison semorrison added merge-conflict The PR has a merge conflict with master, and needs manual merging. and removed merge-conflict The PR has a merge conflict with master, and needs manual merging. labels Jan 7, 2023
@digama0
Copy link
Member

digama0 commented Jan 20, 2023

This should probably be pure not return'. In lean 4 return is used for early return, and pure for the monad operation, while in lean 3 pure and return were interchangeable.

@arienmalec
Copy link
Collaborator Author

This should probably be pure not return'. In lean 4 return is used for early return, and pure for the monad operation, while in lean 3 pure and return were interchangeable.

Makes sense -- I'll hold until after we get resolution for the last issue, and then rename.

@arienmalec arienmalec added awaiting-review The author would like community review of the PR and removed help-wanted The author needs attention to resolve issues labels Jan 20, 2023
kbuzzard
kbuzzard reviewed Jan 21, 2023
View reviewed changes
lake-manifest.json Outdated
@@ -37,18 +37,6 @@
"rev": "72610cec1cd686884a08704f5fa91b45262136f9",
"name": "aesop",
"inputRev?": "master"}},
{"git":
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these changes being made in this PR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They should not be -- this was in error.

@arienmalec
Copy link
Collaborator Author

lake-manifest.json was accidentally included in this PR. Please merge manually and prior to merging, revert lake-manifest.json to master (git checkout origin/master -- lake-manifest.json I believe.

@semorrison semorrison added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 23, 2023
@jcommelin
Copy link
Member

Sorry, I made a mess out of the git history. I "fixed" it using a force push that squashes all the changes into 1 commit.

@jcommelin jcommelin removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 23, 2023
jcommelin
jcommelin reviewed Jan 23, 2023
View reviewed changes
Mathlib/Data/Seq/Computation.lean Outdated Show resolved Hide resolved
Mathlib/Data/Seq/Computation.lean Outdated Show resolved Hide resolved
Mathlib/Data/Seq/Computation.lean Outdated Show resolved Hide resolved
@jcommelin
Copy link
Member

Thanks 🎉

bors merge

@github-actions github-actions bot added ready-to-merge This PR has been sent to bors. and removed awaiting-review The author would like community review of the PR labels Jan 23, 2023
bors bot pushed a commit that referenced this pull request Jan 23, 2023
@arienmalec @jcommelin
feat: port Data.Seq.Computation (#1216)
382737d 
Port of data.seq.computation

Requires renaming `return` to `pure`

Co-authored-by: Johan Commelin <johan@commelin.net>
@bors
Copy link

bors bot commented Jan 23, 2023

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title feat: port Data.Seq.Computation [Merged by Bors] - feat: port Data.Seq.Computation Jan 23, 2023
@bors bors bot closed this Jan 23, 2023
@bors bors bot deleted the port/Data.Seq.Computation branch January 23, 2023 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kbuzzard kbuzzard kbuzzard left review comments

@qawbecrdtey qawbecrdtey qawbecrdtey left review comments

@jcommelin jcommelin Awaiting requested review from jcommelin

Assignees
No one assigned
Labels
mathlib-port This is a port of a theory file from mathlib. ready-to-merge This PR has been sent to bors.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@arienmalec @digama0 @jcommelin @kbuzzard @qawbecrdtey @semorrison