Merge branch 'wireapp:develop' into develop

offsoc · Oct 7, 2024 · ececb73 · ececb73
2 parents 18e5b02 + 4de3d3a
commit ececb73
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 427 deletions.
diff --git a/Makefile b/Makefile
@@ -82,7 +82,10 @@ cabal.project.local:
 
 # Usage: make c package=brig test=1
 .PHONY: c
-c: treefmt
+c: treefmt c-fast
+
+.PHONY: c
+c-fast: 
 	cabal build $(WIRE_CABAL_BUILD_OPTIONS) $(package) || ( make clean-hint; false )
 ifeq ($(test), 1)
 	./hack/bin/cabal-run-tests.sh $(package) $(testargs)

diff --git a/libs/wire-api/src/Wire/API/Message/Proto.hs b/libs/wire-api/src/Wire/API/Message/Proto.hs
@@ -146,6 +146,7 @@ userEntryClients f c = (\x -> c {_userVal = x}) <$> field f (_userVal c)
 --------------------------------------------------------------------------------
 -- Priority
 
+-- | See also `Wire.API.Message.Priority`
 data Priority = LowPriority | HighPriority
   deriving stock (Eq, Show, Ord, Generic)
 

diff --git a/services/gundeck/test/unit/ThreadBudget.hs b/services/gundeck/test/unit/ThreadBudget.hs
@@ -52,6 +52,9 @@ newtype NumberOfThreads = NumberOfThreads {fromNumberOfThreads :: Int}
 
 -- | 'microseconds' determines how long one unit lasts.  there is a trade-off of fast
 -- vs. robust in this whole setup.  this type is supposed to help us find a good sweet spot.
+--
+-- There is also `Milliseconds` (with small `s` after `Milli`) in "Data.Misc".  maybe this
+-- should be cleaned up...
 newtype MilliSeconds = MilliSeconds {fromMilliSeconds :: Int}
   deriving (Eq, Ord, Show, Generic, ToExpr)
 

diff --git a/snapshots/README.md b/snapshots/README.md
diff --git a/snapshots/wire-1.0.yaml b/snapshots/wire-1.0.yaml
diff --git a/snapshots/wire-1.1.yaml b/snapshots/wire-1.1.yaml
diff --git a/snapshots/wire-1.2.yaml b/snapshots/wire-1.2.yaml
diff --git a/snapshots/wire-1.3.yaml b/snapshots/wire-1.3.yaml
diff --git a/snapshots/wire-1.4.yaml b/snapshots/wire-1.4.yaml
diff --git a/snapshots/wire-2.0.yaml b/snapshots/wire-2.0.yaml
diff --git a/snapshots/wire-2.1.yaml b/snapshots/wire-2.1.yaml
diff --git a/snapshots/wire-2.2.yaml b/snapshots/wire-2.2.yaml