6843016aae
The owners plugin should in theory be able to match on subdirs (at least according to its documentation, but it doesn’t and nobody has any idea how to debug it. We already know that subdirectories work just fine, so let’s go the path of least resistance because frankly, I couldn’t care any less. The haskell overlay also moves to the subdir, this way both can be changed in the same go by the same people. Change-Id: I7d98f48afa649ad2c58e38e674e1c4df09039c1c Reviewed-on: https://cl.tvl.fyi/c/depot/+/2347 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: lukegb <lukegb@tvl.fyi>
13 lines
796 B
Diff
13 lines
796 B
Diff
diff --git a/src/Data/Geometry/PlanarSubdivision/Merge.hs b/src/Data/Geometry/PlanarSubdivision/Merge.hs
|
|
index 1136114..3f4e7bb 100644
|
|
--- a/src/Data/Geometry/PlanarSubdivision/Merge.hs
|
|
+++ b/src/Data/Geometry/PlanarSubdivision/Merge.hs
|
|
@@ -153,7 +153,7 @@ mergeWith' mergeFaces p1 p2 = PlanarSubdivision cs vd rd rf
|
|
-- we have to shift the number of the *Arcs*. Since every dart
|
|
-- consists of two arcs, we have to shift by numDarts / 2
|
|
-- Furthermore, we take numFaces - 1 since we want the first
|
|
- -- *internal* face of p2 (the one with FaceId 1) to correspond with the first free
|
|
+ -- /internal/ face of p2 (the one with FaceId 1) to correspond with the first free
|
|
-- position (at index numFaces)
|
|
|
|
cs = p1^.components <> p2'^.components
|