]> Cypherpunks repositories - gostls13.git/commitdiff
text/template: avoid assiging unnecessary variable
authorKunpei Sakai <namusyaka@gmail.com>
Mon, 19 Feb 2018 23:42:11 +0000 (08:42 +0900)
committerIan Lance Taylor <iant@golang.org>
Tue, 20 Feb 2018 15:42:01 +0000 (15:42 +0000)
This follows up CL95235

Change-Id: I62652654e5bb46d2f8f37af468e1fbcc1835bb8a
Reviewed-on: https://go-review.googlesource.com/95295
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/text/template/template.go

index 9ca0705ecc3d42221774cdbc26350f039b5b9c35..41cdd5682c165c8ee2099dcdfdef7e65bc836112 100644 (file)
@@ -125,8 +125,7 @@ func (t *Template) AddParseTree(name string, tree *parse.Tree) (*Template, error
                nt = t.New(name)
        }
        // Even if nt == t, we need to install it in the common.tmpl map.
-       replace := t.associate(nt, tree)
-       if replace || nt.Tree == nil {
+       if t.associate(nt, tree) || nt.Tree == nil {
                nt.Tree = tree
        }
        return nt, nil