Skip to content

Rename CaptureStringVal to CaptureString #278

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.

Sign up for GitHub

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

Merged
MarcoPolo merged 1 commit into from
Jun 5, 2025
+18 −18
Merged

Rename CaptureStringVal to CaptureString #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestMatchAndCaptureMultiaddr(t *testing.T) {
meg.Val(P_IP4),
meg.Val(P_IP6),
),
meg.CaptureStringVal(P_UDP, &udpPort),
meg.CaptureString(P_UDP, &udpPort),
meg.Val(P_QUIC_V1),
meg.Val(P_WEBTRANSPORT),
meg.CaptureZeroOrMoreStrings(P_CERTHASH, &certhashes),
Expand Down
28 changes: 14 additions & 14 deletions x/meg/bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,16 @@ func isWebTransportMultiaddrPrealloc() *preallocatedCapture {
var sni string
p.matcher = meg.PatternToMatcher(
meg.Or(
meg.CaptureStringVal(multiaddr.P_IP4, &ip4Addr),
meg.CaptureStringVal(multiaddr.P_IP6, &ip6Addr),
meg.CaptureStringVal(multiaddr.P_DNS4, &dnsName),
meg.CaptureStringVal(multiaddr.P_DNS6, &dnsName),
meg.CaptureStringVal(multiaddr.P_DNS, &dnsName),
meg.CaptureString(multiaddr.P_IP4, &ip4Addr),
meg.CaptureString(multiaddr.P_IP6, &ip6Addr),
meg.CaptureString(multiaddr.P_DNS4, &dnsName),
meg.CaptureString(multiaddr.P_DNS6, &dnsName),
meg.CaptureString(multiaddr.P_DNS, &dnsName),
),
meg.CaptureStringVal(multiaddr.P_UDP, &udpPort),
meg.CaptureString(multiaddr.P_UDP, &udpPort),
meg.Val(multiaddr.P_QUIC_V1),
meg.Optional(
meg.CaptureStringVal(multiaddr.P_SNI, &sni),
meg.CaptureString(multiaddr.P_SNI, &sni),
),
meg.Val(multiaddr.P_WEBTRANSPORT),
meg.CaptureZeroOrMoreStrings(multiaddr.P_CERTHASH, &p.certHashes),
Expand All @@ -130,16 +130,16 @@ func IsWebTransportMultiaddr(m multiaddr.Multiaddr) (bool, int) {
var certHashesStr []string
matched, _ := m.Match(
meg.Or(
meg.CaptureStringVal(multiaddr.P_IP4, &ip4Addr),
meg.CaptureStringVal(multiaddr.P_IP6, &ip6Addr),
meg.CaptureStringVal(multiaddr.P_DNS4, &dnsName),
meg.CaptureStringVal(multiaddr.P_DNS6, &dnsName),
meg.CaptureStringVal(multiaddr.P_DNS, &dnsName),
meg.CaptureString(multiaddr.P_IP4, &ip4Addr),
meg.CaptureString(multiaddr.P_IP6, &ip6Addr),
meg.CaptureString(multiaddr.P_DNS4, &dnsName),
meg.CaptureString(multiaddr.P_DNS6, &dnsName),
meg.CaptureString(multiaddr.P_DNS, &dnsName),
),
meg.CaptureStringVal(multiaddr.P_UDP, &udpPort),
meg.CaptureString(multiaddr.P_UDP, &udpPort),
meg.Val(multiaddr.P_QUIC_V1),
meg.Optional(
meg.CaptureStringVal(multiaddr.P_SNI, &sni),
meg.CaptureString(multiaddr.P_SNI, &sni),
),
meg.Val(multiaddr.P_WEBTRANSPORT),
meg.CaptureZeroOrMoreStrings(multiaddr.P_CERTHASH, &certHashesStr),
Expand Down
2 changes: 1 addition & 1 deletion x/meg/meg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func TestCapture(t *testing.T) {
{
setup: func() (Matcher, func()) {
var code0str string
return PatternToMatcher(CaptureStringVal(0, &code0str), Val(1)), func() {
return PatternToMatcher(CaptureString(0, &code0str), Val(1)), func() {
if code0str != "hello" {
panic("unexpected value")
}
Expand Down
4 changes: 2 additions & 2 deletions x/meg/sugar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ func CaptureWithF(code int, f CaptureFunc) Pattern {
}

func Val(code int) Pattern {
return CaptureStringVal(code, nil)
return CaptureString(code, nil)
}

// Any is a special code that matches any value.
var Any int = matchAny

func CaptureStringVal(code int, val *string) Pattern {
func CaptureString(code int, val *string) Pattern {
return CaptureWithF(code, captureOneStringValueOrErr(val))
}

Expand Down