Skip to content

[Merged by Bors] - chore: only four spaces for subsequent lines#7286

Closed
mo271 wants to merge 6 commits intomasterfrom
mo271/only_four_spaces
Closed

[Merged by Bors] - chore: only four spaces for subsequent lines#7286
mo271 wants to merge 6 commits intomasterfrom
mo271/only_four_spaces

Conversation

@mo271
Copy link
Copy Markdown
Collaborator

@mo271 mo271 commented Sep 21, 2023


Open in Gitpod

changes occurances found by
^(lemma|theorem) .* :\n {4} +\S
regular expression
^(lemma|theorem) .* :\n {2}\S
regular expression:
^(lemma|theorem) .* :\n {3}\S
regular expression
^(lemma|theorem) .* :\n\S
@mo271 mo271 added awaiting-review awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. labels Sep 21, 2023
@mo271
Copy link
Copy Markdown
Collaborator Author

mo271 commented Sep 21, 2023

This fixes the findings of #7283

@mo271
Copy link
Copy Markdown
Collaborator Author

mo271 commented Sep 21, 2023

From the style guide: "If the theorem statement requires multiple lines, indent the subsequent lines by 4 spaces."

@github-actions github-actions bot removed the awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. label Sep 21, 2023
@sgouezel
Copy link
Copy Markdown
Contributor

bors r+
Thanks!

@github-actions github-actions bot added ready-to-merge This PR has been sent to bors. and removed awaiting-review labels Sep 21, 2023
bors bot pushed a commit that referenced this pull request Sep 21, 2023
Co-authored-by: Moritz Firsching <firsching@google.com>
@bors
Copy link
Copy Markdown

bors bot commented Sep 21, 2023

Pull request successfully merged into master.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot changed the title chore: only four spaces for subsequent lines [Merged by Bors] - chore: only four spaces for subsequent lines Sep 21, 2023
@bors bors bot closed this Sep 21, 2023
@bors bors bot deleted the mo271/only_four_spaces branch September 21, 2023 09:35
kodyvajjha pushed a commit that referenced this pull request Sep 22, 2023
Co-authored-by: Moritz Firsching <firsching@google.com>
Comment on lines +289 to 290
¬SeparatedNhds {x : ℝₗ × ℝₗ | x.1 + x.2 = 0 ∧ ∃ r : ℚ, ↑r = x.1}
{x : ℝₗ × ℝₗ | x.1 + x.2 = 0 ∧ Irrational (toReal x.1)} := 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.

Personally I'd indent line 290 by two more spaces since it's an argument of SeparatedNhds so not "at the same level".

Comment on lines +193 to +195
-- Porting note : Lean can't see `Quot.mk Setoid.r x` is a `ColimitType F` even with type
-- annotation so use `Neg.neg (α := ColimitType F)` to tell Lean negation happens inside
-- `ColimitType F`.
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.

Do we want to force comments to be four-space indented as well?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants