From afae85307206cb56851c31652bd9ae45ba60c800 Mon Sep 17 00:00:00 2001 From: Neal Patel Date: Tue, 27 Jan 2026 22:37:38 +0000 Subject: cmd/go,crypto/mlkem,crypto/x509,encoding/ascii85: clean up tautological/impossible nil conditions Change-Id: I3cdc599ebc93f5c9be5645e7ef7ce167242d9c1b Reviewed-on: https://go-review.googlesource.com/c/go/+/739800 Reviewed-by: Roland Shoemaker LUCI-TryBot-Result: Go LUCI --- src/cmd/internal/script/engine.go | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'src/cmd/internal/script') diff --git a/src/cmd/internal/script/engine.go b/src/cmd/internal/script/engine.go index 05b9433d3e..9480741c10 100644 --- a/src/cmd/internal/script/engine.go +++ b/src/cmd/internal/script/engine.go @@ -580,23 +580,21 @@ func (e *Engine) runCommand(s *State, cmd *command, impl Cmd) error { return nil } - if wait != nil { - stdout, stderr, waitErr := wait(s) - s.stdout = stdout - s.stderr = stderr - if stdout != "" { - s.Logf("[stdout]\n%s", stdout) - } - if stderr != "" { - s.Logf("[stderr]\n%s", stderr) - } - if cmdErr := checkStatus(cmd, waitErr); cmdErr != nil { - return cmdErr - } - if waitErr != nil { - // waitErr was expected (by cmd.want), so log it instead of returning it. - s.Logf("[%v]\n", waitErr) - } + stdout, stderr, waitErr := wait(s) + s.stdout = stdout + s.stderr = stderr + if stdout != "" { + s.Logf("[stdout]\n%s", stdout) + } + if stderr != "" { + s.Logf("[stderr]\n%s", stderr) + } + if cmdErr := checkStatus(cmd, waitErr); cmdErr != nil { + return cmdErr + } + if waitErr != nil { + // waitErr was expected (by cmd.want), so log it instead of returning it. + s.Logf("[%v]\n", waitErr) } return nil } -- cgit v1.3-6-g1900