Skip to content

[Merged by Bors] - style: fix some mis-placed by#13203

Closed
grunweg wants to merge 8 commits intomasterfrom
MR-replace-misplaced-by1
Closed

[Merged by Bors] - style: fix some mis-placed by#13203
grunweg wants to merge 8 commits intomasterfrom
MR-replace-misplaced-by1

Conversation

@grunweg
Copy link
Copy Markdown
Contributor

@grunweg grunweg commented May 25, 2024


Commits can be reviewed individually: the second commit is fully automatic (using VS Code's search-and-replace, in regex mode); the last commit fixes the line length (updating the syntax of that comment to Lean 4).

Open in Gitpod

grunweg added 2 commits May 25, 2024 14:06
This fixes the worst cases, where the 'by' was not even indented correctly.
Copy link
Copy Markdown
Contributor

@Ruben-VandeVelde Ruben-VandeVelde left a comment

Choose a reason for hiding this comment

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

You're allowed to argue I'm scope-creeping your PR :)

example (x : ℝ) : deriv (fun x ↦ cos (sin x) * exp x) x = (cos(sin(x))-sin(sin(x))*cos(x))*exp(x) :=
by { simp, ring }
example (x : ℝ) :
deriv (fun x ↦ cos (sin x) * exp x) x = (cos(sin(x))-sin(sin(x))*cos(x))*exp(x) := by
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm not even sure the over-parenthesized syntax works in lean 4

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Trying on the playground: This syntax parses, without the spaces it does not. It seems the example fails, though...

@grunweg
Copy link
Copy Markdown
Contributor Author

grunweg commented May 25, 2024

You're allowed to argue I'm scope-creeping your PR :)

You are, but that need not be a problem :-) If you test and suggest a change, I'm happy to accept it - I am less willing to do this legwork myself. To this end, I have just accepted all of your suggestions, except for one which needs checking.

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
Copy link
Copy Markdown
Contributor Author

@grunweg grunweg left a comment

Choose a reason for hiding this comment

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

Good catch on all of them, thanks!

@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label May 27, 2024
@grunweg grunweg removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label May 27, 2024
@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label May 29, 2024
@grunweg grunweg removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label May 29, 2024
Copy link
Copy Markdown
Member

@riccardobrasca riccardobrasca left a comment

Choose a reason for hiding this comment

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

Thanks!

bors d+

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented May 30, 2024

✌️ grunweg can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@ghost ghost added delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). and removed awaiting-review labels May 30, 2024
@grunweg
Copy link
Copy Markdown
Contributor Author

grunweg commented May 30, 2024

Thanks for the review; I followed your suggestion.
bors r+

mathlib-bors bot pushed a commit that referenced this pull request May 30, 2024
@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented May 30, 2024

Pull request successfully merged into master.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title style: fix some mis-placed by [Merged by Bors] - style: fix some mis-placed by May 30, 2024
@mathlib-bors mathlib-bors bot closed this May 30, 2024
@mathlib-bors mathlib-bors bot deleted the MR-replace-misplaced-by1 branch May 30, 2024 16:42
callesonne pushed a commit that referenced this pull request Jun 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants