Skip to content

Commit 53d9c7e

Browse files
authored
chore(go.mod): remove replace directive for dlclark/regexp2 (coder#16069)
Right now, it looks like we only utilise dlclark/regexp2 as a transitive dependency of charmbracelet/glamour: ``` $ go mod why github.com/dlclark/regexp2 # github.com/dlclark/regexp2 github.com/coder/coder/v2/coderd/render github.com/charmbracelet/glamour/ansi github.com/alecthomas/chroma/v2 github.com/dlclark/regexp2 ``` The reason for this replacement was to avoid a goroutine leak in unit tests. However, I'm currently unable to replace the goroutine leak as we do not perform any leak detection tests in `coderd/render`. If required, we can use the workaround detailed in regexp2's README.md: https://github.com/dlclark/regexp2/blob/v1.11.4/README.md#goroutine-leak-error
1 parent dc293ea commit 53d9c7e

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ replace github.com/fatedier/kcp-go => github.com/coder/kcp-go v2.0.4-0.202204091
3434
// https://github.com/tcnksm/go-httpstat/pull/29
3535
replace github.com/tcnksm/go-httpstat => github.com/coder/go-httpstat v0.0.0-20230801153223-321c88088322
3636

37-
// See https://github.com/dlclark/regexp2/issues/63
38-
replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
39-
4037
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
4138
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
4239
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20241218201526-b53d914d625f

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvd
265265
github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI=
266266
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
267267
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
268-
github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
269-
github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
268+
github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
269+
github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
270270
github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE=
271271
github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
272272
github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4=

0 commit comments

Comments
 (0)