Skip to content

Commit

Permalink
fix a couple more warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchellwrosen committed Aug 27, 2024
1 parent 9346865 commit 2672623
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion unison-cli/src/Unison/Cli/MonadUtils.hs
Original file line number Diff line number Diff line change
Expand Up @@ -556,5 +556,7 @@ makeParsingEnv path names = do
ParsingEnv
{ uniqueNames = uniqueName,
uniqueTypeGuid = loadUniqueTypeGuid path,
names
names,
maybeNamespace = Nothing,
localNamespacePrefixedTypesAndConstructors = mempty
}
4 changes: 3 additions & 1 deletion unison-merge/src/Unison/Merge/Mergeblob4.hs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ makeMergeblob4 blob = do
-- call to `error`.
uniqueNames = Parser.UniqueName \_ _ -> Nothing,
uniqueTypeGuid = \name -> Identity (Map.lookup name blob.uniqueTypeGuids),
names = stageOneNames
names = stageOneNames,
maybeNamespace = Nothing,
localNamespacePrefixedTypesAndConstructors = mempty
}
file <- runIdentity (Parsers.parseFile "<merge>" (Pretty.toPlain 80 blob.unparsedFile) parsingEnv)
Right
Expand Down

0 comments on commit 2672623

Please sign in to comment.