diff options
| author | Daniel Martí <mvdan@mvdan.cc> | 2023-09-17 21:46:35 +0100 |
|---|---|---|
| committer | Daniel Martí <mvdan@mvdan.cc> | 2024-03-29 22:22:45 +0000 |
| commit | 754f870381ef5e2c60c0edd4f902e7063ffb4452 (patch) | |
| tree | 181d8fc4dad4ff4887d18ce98eb9b13daa21b802 /src/regexp | |
| parent | dcf046f02150900550c02e2ad0c77a0ee88bb6f7 (diff) | |
| download | go-754f870381ef5e2c60c0edd4f902e7063ffb4452.tar.gz go-754f870381ef5e2c60c0edd4f902e7063ffb4452.zip | |
crypto/tls,regexp: remove always-nil error results
These were harmless, but added unnecessary verbosity to the code.
This can happen as a result of refactors: for example,
the method sessionState used to return errors in some cases.
Change-Id: I4e6dacc01ae6a49b528c672979f95cbb86795a85
Reviewed-on: https://go-review.googlesource.com/c/go/+/528995
Reviewed-by: Leo Isla <islaleo93@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Olivier Mengué <olivier.mengue@gmail.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: qiulaidongfeng <2645477756@qq.com>
Reviewed-by: Quim Muntal <quimmuntal@gmail.com>
Diffstat (limited to 'src/regexp')
| -rw-r--r-- | src/regexp/syntax/parse.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/regexp/syntax/parse.go b/src/regexp/syntax/parse.go index 6ed6491c80..8f16f6308f 100644 --- a/src/regexp/syntax/parse.go +++ b/src/regexp/syntax/parse.go @@ -941,9 +941,7 @@ func parse(s string, flags Flags) (_ *Regexp, err error) { p.op(opLeftParen).Cap = p.numCap t = t[1:] case '|': - if err = p.parseVerticalBar(); err != nil { - return nil, err - } + p.parseVerticalBar() t = t[1:] case ')': if err = p.parseRightParen(); err != nil { @@ -1328,7 +1326,7 @@ func matchRune(re *Regexp, r rune) bool { } // parseVerticalBar handles a | in the input. -func (p *parser) parseVerticalBar() error { +func (p *parser) parseVerticalBar() { p.concat() // The concatenation we just parsed is on top of the stack. @@ -1338,8 +1336,6 @@ func (p *parser) parseVerticalBar() error { if !p.swapVerticalBar() { p.op(opVerticalBar) } - - return nil } // mergeCharClass makes dst = dst|src. |