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

bump argo submodule #1483

Closed
wants to merge 1 commit into from
Closed

bump argo submodule #1483

wants to merge 1 commit into from

Conversation

pnwamk
Copy link
Contributor

@pnwamk pnwamk commented Oct 19, 2021

No description provided.

@jpaykin
Copy link
Contributor

jpaykin commented Oct 19, 2021

I got the following error when building on this branch, does CryptolServer.Data.Type (in cryptol/cryptol-remote-api) need to be updated to deal with the updated JSON representation?

[ 1 of 16] Compiling CryptolServer.Data.Type ( src/CryptolServer/Data/Type.hs, /home/jennifer/work/PICARD/saw-script/dist-newstyle/build/x86_64-linux/ghc-8.10.7/cryptol-remote-api-0.1.0.0/build/CryptolServer/Data/Type.o, /home/jennifer/work/PICARD/saw-script/dist-newstyle/build/x86_64-linux/ghc-8.10.7/cryptol-remote-api-0.1.0.0/build/CryptolServer/Data/Type.dyn_o ) [Cryptol.Utils.RecordMap changed]

src/CryptolServer/Data/Type.hs:222:25: error:
    • Couldn't match expected type ‘JSON.Key’ with actual type ‘T.Text’
    • In the first argument of ‘(.=)’, namely ‘T.pack (show (pp f))’
      In the expression: T.pack (show (pp f)) .= JSONType ns t'
      In the first argument of ‘JSON.object’, namely
        ‘[T.pack (show (pp f)) .= JSONType ns t' |
            (f, t') <- canonicalFields fields]’
    |
222 |           JSON.object [ T.pack (show (pp f)) .= JSONType ns t'
    |                         ^^^^^^^^^^^^^^^^^^^^

src/CryptolServer/Data/Type.hs:234:35: error:
    • Couldn't match type ‘Data.Aeson.KeyMap.KeyMap JSON.Value’
                     with ‘HM.HashMap k0 a0’
      Expected type: HM.HashMap k0 a0
        Actual type: JSON.Object
    • In the second argument of ‘HM.lookup’, namely ‘o’
      In the expression: HM.lookup "type" o
      In the expression:
        case HM.lookup "type" o of
          Just t -> asType t o
          Nothing
            -> case HM.lookup "prop" o of
                 Just p -> asProp p o
                 Nothing -> fail "Expected type or prop key"
    |
234 |             case HM.lookup "type" o of
    |                                   ^

src/CryptolServer/Data/Type.hs:237:39: error:
    • Couldn't match type ‘Data.Aeson.KeyMap.KeyMap JSON.Value’
                     with ‘HM.HashMap k1 a1’
      Expected type: HM.HashMap k1 a1
        Actual type: JSON.Object
    • In the second argument of ‘HM.lookup’, namely ‘o’
      In the expression: HM.lookup "prop" o
      In the expression:
        case HM.lookup "prop" o of
          Just p -> asProp p o
          Nothing -> fail "Expected type or prop key"
    |
237 |                 case HM.lookup "prop" o of
    |

@pnwamk
Copy link
Contributor Author

pnwamk commented Oct 19, 2021

does CryptolServer.Data.Type (in cryptol/cryptol-remote-api) need to be updated to deal with the updated JSON representation?

Ah, that could be. This might need to be a slightly more complicated fix. I'll take a look.

@pnwamk
Copy link
Contributor Author

pnwamk commented Oct 20, 2021

We probably need to update some code to either check for the aeson version (as is done here) or create an upper bound to avoid the breaking change in aeson for now (see #1486).

@pnwamk
Copy link
Contributor Author

pnwamk commented Oct 20, 2021

#1486 solves the issue this PR intended (and failed) to.

@pnwamk pnwamk closed this Oct 20, 2021
@pnwamk pnwamk deleted the bump-argo-submodule branch October 20, 2021 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants