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.

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

Fix typos in *.hs files #10613

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Fix typos in *.hs files #10613

merged 2 commits into from
Dec 5, 2024

Conversation

philderbeast
Copy link
Collaborator

@philderbeast philderbeast commented Dec 2, 2024

Follow on from #10603, using typos --write-changes over *.hs files initially and then manually fixing any other typos found but with ambiguous fixes.

Note

I chose the A template to err on the side of caution. Almost all changes are to haddock comments.

There is one exported function name that this changes:

module Distribution.PackageDescription.Check.Warning
  (
...
-  , extractCheckExplantion
+  , extractCheckExplanation
...
  ) where

However this is in a module that is not exported from Cabal:

cabal/Cabal/Cabal.cabal

Lines 326 to 345 in 1f52963

other-modules:
Distribution.Backpack.PreExistingComponent
Distribution.Backpack.ReadyComponent
Distribution.Backpack.MixLink
Distribution.Backpack.ModuleScope
Distribution.Backpack.UnifyM
Distribution.Backpack.Id
Distribution.Utils.UnionFind
Distribution.Compat.Async
Distribution.Compat.CopyFile
Distribution.Compat.GetShortPathName
Distribution.Compat.SnocList
Distribution.GetOpt
Distribution.Lex
Distribution.PackageDescription.Check.Common
Distribution.PackageDescription.Check.Conditional
Distribution.PackageDescription.Check.Monad
Distribution.PackageDescription.Check.Paths
Distribution.PackageDescription.Check.Target
Distribution.PackageDescription.Check.Warning


Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

TWIMC: there's one API change

@philderbeast
Copy link
Collaborator Author

philderbeast commented Dec 2, 2024

TWIMC: there's one API change

@geekosaur, what does your API checking, of #10259, have say about this change1?

Footnotes

  1. I will try the API change checks locally, make generate-api, make check-api and make update-api.

@geekosaur
Copy link
Collaborator

geekosaur commented Dec 2, 2024

I haven't checked because last time I poked at the PR I was unexpectedly finding references to cabal 3.15 (i.e. master) in the API files. I think that's just because I failed to remove dist-* first, but if not then we have a problem on 3.12 already and it may be a big one.

Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

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

That appears to be the only one (the others are either let/where bindings or not exported). We probably want to give this one a miss, or start a deprecation on the misspelled one.

@Kleidukos
Copy link
Member

@geekosaur is right, this is a good moment to try it out.

@philderbeast please could you create a wiki page based on this template? https://github.com/haskell/cabal/wiki/Deprecation-Process

You don't have to do every step by yourself. Especially feel free to rope in people, or mention it on Matrix so that it may be included in this week's agenda.

@philderbeast
Copy link
Collaborator Author

@Kleidukos we can skip the deprecation process for this rename as extractCheckExplantion was exported from Distribution.PackageDescription.Check.Warning in other-modules and @geekosaur confirms this in #10613 (comment).

@Kleidukos
Copy link
Member

Sorry, then yeah nevermind. :)

@ulysses4ever
Copy link
Collaborator

My bad: I jumped the gun with calling it an API change...

@philderbeast
Copy link
Collaborator Author

My bad: I jumped the gun with calling it an API change...

All good. You flagged that it might be before I'd edited the PR description to say that the module is in other-modules. Better to be safe than sorry with API changes.

image

@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Dec 3, 2024
The typos tool cannot --write-changes when the fix is ambigous. These need manual fixes:
- Typo -expections
- Typo ths
- Typo ot
- Typo dependend
@philderbeast
Copy link
Collaborator Author

Label merge+no rebase is necessary when the pull request is from an organisation.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Dec 5, 2024
@mergify mergify bot merged commit 91769ab into haskell:master Dec 5, 2024
47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge+no rebase ready and waiting Mergify is waiting out the cooldown period
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants