unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-04 21:57:25 +03:00
Code Issues Projects Releases Wiki Activity

fix merge markers left in test suite

Browse Source
This commit is contained in:
Mitchell Rosen 2024-01-16 14:30:31 -05:00
parent bc434ef090
commit 447e924063
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
parser-typechecker/src/Unison/Runtime/IOSource.hs
View File

@ -7,7 +7,6 @@ import Control.Lens (view, _2)
import Control.Monad.Morph (hoist)
import Data.List (elemIndex, genericIndex)
import qualified Data.Map as Map
import Data.Map qualified as Map
import Data.Text qualified as Text
import Text.RawString.QQ (r)
import Unison.Builtin qualified as Builtin

35
unison-syntax/test/Main.hs
View File

@ -1,40 +1,17 @@
<<<<<<< HEAD
{-# OPTIONS_GHC -fno-warn-orphans #-}
||||||| bf0186aef
=======
{-# OPTIONS_GHC -Wno-orphans #-}
>>>>>>> f746fb7927c4b906d8141b4d0d7d5a0fff184a24
module Main (main) where
<<<<<<< HEAD
import qualified Data.Text as Text
||||||| bf0186aef
=======
import Data.Maybe (fromJust)
import Data.Text qualified as Text
>>>>>>> f746fb7927c4b906d8141b4d0d7d5a0fff184a24
import EasyTest
import System.IO.CodePage (withCP65001)
<<<<<<< HEAD
import qualified Unison.HashQualified' as HQ'
import Unison.Prelude
import Unison.ShortHash (ShortHash)
import qualified Unison.ShortHash as ShortHash
||||||| bf0186aef
import qualified Unison.ShortHash as ShortHash
=======
import Unison.HashQualified' qualified as HQ'
import Unison.Prelude
import Unison.ShortHash (ShortHash)
import Unison.ShortHash qualified as ShortHash
>>>>>>> f746fb7927c4b906d8141b4d0d7d5a0fff184a24
import Unison.Syntax.Lexer
import qualified Unison.Syntax.Name as Name (unsafeFromString)
instance IsString ShortHash where
fromString =
ShortHash.unsafeFromText . Text.pack
import Unison.Syntax.Name qualified as Name (unsafeFromString)
main :: IO ()
main =
@ -112,16 +89,8 @@ test =
],
t ".Foo.Bar.+" [simpleSymbolyId ".Foo.Bar.+"],
-- idents with hashes
<<<<<<< HEAD
t "foo#bar" [WordyId (HQ'.HashQualified "foo" "#bar")],
t "+#bar" [SymbolyId (HQ'.HashQualified "+" "#bar")],
||||||| bf0186aef
t "foo#bar" [WordyId "foo" (Just (ShortHash.unsafeFromText "#bar"))],
t "+#bar" [SymbolyId "+" (Just (ShortHash.unsafeFromText "#bar"))],
=======
t "foo#bar" [WordyId "foo" (Just "#bar")],
t "+#bar" [SymbolyId "+" (Just "#bar")],
>>>>>>> f746fb7927c4b906d8141b4d0d7d5a0fff184a24
-- note - these are all the same, just with different spacing
let ex1 = "if x then y else z"
ex2 = unlines ["if", " x", "then", " y", "else z"]