Skip to content

Commit 3fe6879

Browse files
authored
Merge pull request #59 from unisoncomputing/cp/bump-trunk-2025-04-30
Bump unison trunk
2 parents afd96fd + e211308 commit 3fe6879

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/Share/Backend.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ getTermTag r termType = do
192192
V2Referent.Con ref _ -> Just <$> Codebase.expectDeclKind ref
193193
pure $
194194
if
195-
| isDoc -> Doc
196-
| isTest -> Test
197-
| Just CT.Effect <- constructorType -> Constructor Ability
198-
| Just CT.Data <- constructorType -> Constructor Data
199-
| otherwise -> Plain
195+
| isDoc -> Doc
196+
| isTest -> Test
197+
| Just CT.Effect <- constructorType -> Constructor Ability
198+
| Just CT.Data <- constructorType -> Constructor Data
199+
| otherwise -> Plain
200200

201201
getTypeTag ::
202202
(PG.QueryM m) =>
@@ -314,7 +314,7 @@ typeDeclHeader ppe r = case Reference.toId r of
314314
Just decl ->
315315
DisplayObject.UserObject $
316316
Syntax.convertElement
317-
<$> Pretty.render defaultWidth (DeclPrinter.prettyDeclHeader name decl)
317+
<$> Pretty.render defaultWidth (DeclPrinter.prettyDeclHeader DeclPrinter.RenderUniqueTypeGuids'No name decl)
318318
Nothing ->
319319
pure (DisplayObject.BuiltinObject (Backend.formatTypeName ppe r))
320320
where

transcripts/share-apis/user-creation/run.zsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ new_user_cookie_jar=$(cookie_jar_for_user_id "new_user")
1010
# Should be able to create a new user via the login flow by following redirects.
1111
# Note that the end of the redirect chain ends up on the Share UI (localhost:1234) which may or may not be running, so
1212
# we just ignore bad status codes from that server.
13-
curl -v -L -I -o /dev/null -w '{"result_url": "%{url_effective}"}' --request "GET" --cookie "$new_user_cookie_jar" --cookie-jar "$new_user_cookie_jar" "http://localhost:5424/login" || true
13+
curl -s -L -I -o /dev/null -w '{"result_url": "%{url_effective}"}' --request "GET" --cookie "$new_user_cookie_jar" --cookie-jar "$new_user_cookie_jar" "http://localhost:5424/login" || true
1414

1515
# user should now be logged in as the local github user.
1616
fetch "new_user" GET new-user-profile /account

unison

Submodule unison updated 119 files

0 commit comments

Comments
 (0)