Skip to content

Tweak the comment line parsing rule#1495

Closed
hw202207 wants to merge 0 commit intoyesodweb:masterfrom
hw202207:master
Closed

Tweak the comment line parsing rule#1495
hw202207 wants to merge 0 commit intoyesodweb:masterfrom
hw202207:master

Conversation

@hw202207
Copy link
Contributor

@hw202207 hw202207 commented May 16, 2023 •
edited
Loading

Context

  • In order to support -- | (besides -- | ) being an empty line

Before submitting your PR, check that you've:

  • Ran stylish-haskell on any changed files.
    • I run stylish-haskell 0.14.0.0 but got changes unrelated hence I'm not sure if stylish-haskell is still a must. I bet if it's enabled in CI.
    • The diff
diff --git a/persistent/Database/Persist/Quasi/Internal.hs b/persistent/Database/Persist/Quasi/Internal.hs
index d73e0973..aad9ec76 100644
--- a/persistent/Database/Persist/Quasi/Internal.hs
+++ b/persistent/Database/Persist/Quasi/Internal.hs
@@ -53,8 +53,8 @@ module Database.Persist.Quasi.Internal
 import Prelude hiding (lines)

 import Control.Applicative (Alternative((<|>)))
-import Data.Char (isDigit, isLower, isSpace, isUpper, toLower)
 import Control.Monad
+import Data.Char (isDigit, isLower, isSpace, isUpper, toLower)
 import Data.List (find, foldl')
 import Data.List.NonEmpty (NonEmpty(..))
 import qualified Data.List.NonEmpty as NEL

After submitting your PR:

  • Update the Changelog.md file with a link to your PR
  • Bumped the version number if there isn't an (unreleased) on the Changelog

☝️ Will have an follow up. Looks like it's safe to bump to 2.14.5.1?

  • Check that CI passes (or if it fails, for reasons unrelated to your change, like CI timeouts)

@hw202207 hw202207 marked this pull request as ready for review May 16, 2023 20:20
@parsonsmatt
Copy link
Collaborator

parsonsmatt commented May 16, 2023

Yeah, 2.14.5.1 should be fine

stylish-haskell over the file you changed should be sufficient - it's not a CI step, and it's not strictly required but it is nice to have.

Thanks!

@hw202207
Copy link
Contributor Author

hw202207 commented May 16, 2023

hw202207#1
Will update the PR to this repo for the version bump and changelog changes.

@hw202207 hw202207 mentioned this pull request May 30, 2023
Closed
7 tasks
@parsonsmatt
Copy link
Collaborator

parsonsmatt commented Jun 1, 2023

Are you willing to do the patch version bump? Thanks!

@hw202207
Copy link
Contributor Author

hw202207 commented Jun 1, 2023 •
edited
Loading

@hw202207 hw202207 closed this Jun 28, 2023
@hw202207
Copy link
Contributor Author

hw202207 commented Jun 28, 2023 •
edited
Loading

@parsonsmatt
Moved to this PR: #1505
Since I reconstructed my forked master branch.
Sorry for the disruption and thanks much for reviewing!

@hw202207 hw202207 mentioned this pull request Jun 28, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hw202207 @parsonsmatt