diff --git a/meg_test.go b/meg_test.go index f31dc0d..bfb6065 100644 --- a/meg_test.go +++ b/meg_test.go @@ -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), diff --git a/x/meg/bench_test.go b/x/meg/bench_test.go index 6d05ba3..f9d4e9c 100644 --- a/x/meg/bench_test.go +++ b/x/meg/bench_test.go @@ -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), @@ -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), diff --git a/x/meg/meg_test.go b/x/meg/meg_test.go index 83c2718..ab63e47 100644 --- a/x/meg/meg_test.go +++ b/x/meg/meg_test.go @@ -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") } diff --git a/x/meg/sugar.go b/x/meg/sugar.go index e8ce539..b1885c9 100644 --- a/x/meg/sugar.go +++ b/x/meg/sugar.go @@ -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)) }