Skip to content

[Merged by Bors] - chore: remove terminal, terminal refines#10762

Closed
adomani wants to merge 5 commits intomasterfrom
adomani/easy_terminal_refines
Closed

[Merged by Bors] - chore: remove terminal, terminal refines#10762
adomani wants to merge 5 commits intomasterfrom
adomani/easy_terminal_refines

Conversation

@adomani
Copy link
Copy Markdown
Contributor

@adomani adomani commented Feb 20, 2024

I replaced a few "terminal" refine/refine's with exact.

The strategy was very simple-minded: essentially any refine whose following line had smaller indentation got replaced by exact and then I cleaned up the mess.

This PR certainly leaves some further terminal refines, but maybe the current change is beneficial.


Open in Gitpod

@adomani adomani changed the title Remove terminal, terminal refines chore: remove terminal, terminal refines Feb 20, 2024
@fpvandoorn
Copy link
Copy Markdown
Member

Thanks!

bors merge

@github-actions github-actions bot added ready-to-merge This PR has been sent to bors. and removed awaiting-review labels Feb 21, 2024
@adomani
Copy link
Copy Markdown
Contributor Author

adomani commented Feb 21, 2024

@fpvandoorn I merged the new master into this PR to fix the conflicts, but there were none. Should I push the merge?

@fpvandoorn
Copy link
Copy Markdown
Member

fpvandoorn commented Feb 21, 2024

If there is no merge conflict with master, then there is no point pushing (and it might cancel a bors run). It conflicts with another PR in the same batch.
I expect that this conflicts with #10714.
I'm taking this off the merge queue for now, maybe tomorrow you can merge master (with merge conflict, if this is indeed a conflicting PR) and merge it yourself?

bors d+

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Feb 21, 2024

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

@github-actions github-actions bot added the delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). label Feb 21, 2024
mathlib-bors bot pushed a commit that referenced this pull request Feb 21, 2024
I replaced a few "terminal" `refine/refine'`s with `exact`.

The strategy was very simple-minded: essentially any `refine` whose following line had smaller indentation got replaced by `exact` and then I cleaned up the mess.

This PR certainly leaves some further terminal `refine`s, but maybe the current change is beneficial.
@fpvandoorn
Copy link
Copy Markdown
Member

bors r-

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Feb 21, 2024

Canceled.

@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 Feb 21, 2024
@ghost ghost removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Feb 21, 2024
@fpvandoorn
Copy link
Copy Markdown
Member

bors merge

mathlib-bors bot pushed a commit that referenced this pull request Feb 21, 2024
I replaced a few "terminal" `refine/refine'`s with `exact`.

The strategy was very simple-minded: essentially any `refine` whose following line had smaller indentation got replaced by `exact` and then I cleaned up the mess.

This PR certainly leaves some further terminal `refine`s, but maybe the current change is beneficial.
@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Feb 21, 2024

Pull request successfully merged into master.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title chore: remove terminal, terminal refines [Merged by Bors] - chore: remove terminal, terminal refines Feb 21, 2024
@mathlib-bors mathlib-bors bot closed this Feb 21, 2024
@mathlib-bors mathlib-bors bot deleted the adomani/easy_terminal_refines branch February 21, 2024 23:16
thorimur pushed a commit that referenced this pull request Feb 24, 2024
I replaced a few "terminal" `refine/refine'`s with `exact`.

The strategy was very simple-minded: essentially any `refine` whose following line had smaller indentation got replaced by `exact` and then I cleaned up the mess.

This PR certainly leaves some further terminal `refine`s, but maybe the current change is beneficial.
thorimur pushed a commit that referenced this pull request Feb 26, 2024
I replaced a few "terminal" `refine/refine'`s with `exact`.

The strategy was very simple-minded: essentially any `refine` whose following line had smaller indentation got replaced by `exact` and then I cleaned up the mess.

This PR certainly leaves some further terminal `refine`s, but maybe the current change is beneficial.
riccardobrasca pushed a commit that referenced this pull request Mar 1, 2024
I replaced a few "terminal" `refine/refine'`s with `exact`.

The strategy was very simple-minded: essentially any `refine` whose following line had smaller indentation got replaced by `exact` and then I cleaned up the mess.

This PR certainly leaves some further terminal `refine`s, but maybe the current change is beneficial.
dagurtomas pushed a commit that referenced this pull request Mar 22, 2024
I replaced a few "terminal" `refine/refine'`s with `exact`.

The strategy was very simple-minded: essentially any `refine` whose following line had smaller indentation got replaced by `exact` and then I cleaned up the mess.

This PR certainly leaves some further terminal `refine`s, but maybe the current change is beneficial.
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). ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants