Skip to content

Commit 373ccf3

Browse files
authored
Merge pull request #4867 from guqicun/trunk
chore: remove repetitive words
2 parents cdfe7fb + d525cb5 commit 373ccf3

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

codebase2/codebase-sqlite/sql/007-add-name-lookup-mounts.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
-- This table is used to associate a mount point with a particular name lookup index.
55
CREATE TABLE name_lookup_mounts (
6-
-- The the parent index we're mounting inside of.
6+
-- The parent index we're mounting inside of.
77
parent_root_branch_hash_id INTEGER NOT NULL REFERENCES name_lookups(root_branch_hash_id) ON DELETE CASCADE,
88
-- The index we're mounting.
99
-- Don't allow deleting a mounted name lookup while it's still mounted in some other index,

parser-typechecker/src/Unison/Codebase/Metadata.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Unison.Util.Star2 qualified as Star2
1313
type Value = TermReference
1414

1515
-- `a` is generally the type of references or hashes
16-
-- `n` is generally the the type of name associated with the references
16+
-- `n` is generally the type of name associated with the references
1717
-- `Value` is the metadata value itself.
1818
type Star a n = Star2 a n Value
1919

parser-typechecker/src/Unison/Runtime/Pattern.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ splitMatrix v rf cons (PM rs) =
486486
mmap = fmap (\(t, fs) -> (t, splitRow v rf t fs =<< rs)) cons
487487

488488
-- Monad for pattern preparation. It is a state monad carrying a fresh
489-
-- variable source, the list of variables bound the the pattern being
489+
-- variable source, the list of variables bound the pattern being
490490
-- prepared, and a variable renaming mapping.
491491
type PPM v a = State (Word64, [v], Map v v) a
492492

parser-typechecker/src/Unison/Syntax/DeclParser.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ declarations = do
6868
<> [(v, DD.annotation . DD.toDataDecl <$> es) | (v, es) <- Map.toList mesBad]
6969

7070
-- | When we first walk over the modifier, it may be a `unique`, in which case we want to use a function in the parsing
71-
-- environment to map the the type's name (which we haven't parsed yet) to a GUID to reuse (if any).
71+
-- environment to map the type's name (which we haven't parsed yet) to a GUID to reuse (if any).
7272
--
7373
-- So, we parse into this temporary "unresolved modifier" type, which is soon resolved to a real Modifier once we know
7474
-- the type name.

parser-typechecker/src/Unison/UnisonFile.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ mapTerms f (UnisonFileId datas effects terms watches) =
142142
-- rule2 = @rewrite term (x -> f x) ==> f
143143
--
144144
-- Here, `rule1` introduces a variable `f`, which can stand for
145-
-- any definition. Whereas `rule2` refers to the the top-level `f`
145+
-- any definition. Whereas `rule2` refers to the top-level `f`
146146
-- function in the file.
147147
--
148148
-- This function returns a tuple of: (prepareRule, preparedFile, finish)

parser-typechecker/tests/Unison/Test/UnisonSources.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ resultTest rt uf filepath = do
142142
uf
143143
case term of
144144
Right tm -> do
145-
-- compare the the watch expression from the .u with the expr in .ur
145+
-- compare the watch expression from the .u with the expr in .ur
146146
let watchResult = head (view _5 <$> Map.elems watches)
147147
tm' = Term.letRec' False (bindings <&> \(sym, tm) -> (sym, (), tm)) watchResult
148148
-- note . show $ tm'

unison-cli/src/Unison/Codebase/TranscriptParser.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ run verbosity dir stanzas codebase runtime sbRuntime nRuntime config ucmVersion
411411
liftIO (outputEcho $ show s)
412412
liftIO (writeIORef allowErrors errOk)
413413
-- Open a ucm block which will contain the output from UCM
414-
-- after processing the the UnisonFileChanged event.
414+
-- after processing the UnisonFileChanged event.
415415
liftIO (output "```ucm\n")
416416
-- Close the ucm block after processing the UnisonFileChanged event.
417417
atomically . Q.enqueue cmdQueue $ Nothing

unison-cli/src/Unison/LSP/HandlerUtils.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ withCancellation mayTimeoutMillis handler message respond = do
8181
-- No matter what it's possible for a message to be cancelled before the
8282
-- canceller has been added, but this means we're not blocking the request waiting for
8383
-- contention on the cancellation map on every request.
84-
-- The the majority of requests should be fast enough to complete "instantly" anyways.
84+
-- The majority of requests should be fast enough to complete "instantly" anyways.
8585
waitForCancel :: (Int32 |? Text) -> Lsp ()
8686
waitForCancel reqId = do
8787
barrier <- newEmptyMVar

unison-cli/src/Unison/LSP/Queries.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ instance Functor SourceNode where
194194
fmap f (TypeNode t) = TypeNode (fmap f t)
195195
fmap f (PatternNode t) = PatternNode (fmap f t)
196196

197-
-- | Find the the node in a term which contains the specified position, but none of its
197+
-- | Find the node in a term which contains the specified position, but none of its
198198
-- children contain that position.
199199
findSmallestEnclosingNode :: Pos -> Term Symbol Ann -> Maybe (SourceNode Ann)
200200
findSmallestEnclosingNode pos term
@@ -295,7 +295,7 @@ findSmallestEnclosingPattern pos pat
295295
| conRef == Builtins.pairRef && mayUnitRef == Builtins.unitRef -> Just pat1
296296
_ -> Nothing
297297

298-
-- | Find the the node in a type which contains the specified position, but none of its
298+
-- | Find the node in a type which contains the specified position, but none of its
299299
-- children contain that position.
300300
-- This is helpful for finding the specific type reference of a given argument within a type arrow
301301
-- that a position references.

unison-cli/src/Unison/Share/Sync.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ completeTempEntities httpClient unisonShareUrl connect repoInfo downloadedCallba
602602
workers <- readTVar workerCount
603603
check (workers < maxSimultaneousPullDownloaders + 2)
604604
-- we do need to record the downloader as working outside of the worker thread, not inside.
605-
-- otherwise, we might erroneously fall through the the teardown logic below and conclude there's
605+
-- otherwise, we might erroneously fall through the teardown logic below and conclude there's
606606
-- nothing more for the dispatcher to do, when in fact a downloader thread just hasn't made it as
607607
-- far as recording its own existence
608608
recordWorking workerCount

0 commit comments

Comments
 (0)