A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/kubernetes-sigs/kubebuilder/commit/7c707052daa2e8bd51f47548c02710b1f1f7a77e below:

Merge pull request #4654 from kersten/fix/plugin-util-avoid-shadowing… · kubernetes-sigs/kubebuilder@7c70705 · GitHub

File tree Expand file treeCollapse file tree 2 files changed

+5

-7

lines changed

Filter options

Expand file treeCollapse file tree 2 files changed

+5

-7

lines changed Original file line number Diff line number Diff line change

@@ -115,7 +115,7 @@ func AppendCodeAtTheEnd(filename, code string) error {

115 115

return err

116 116

}

117 117

defer func() {

118 -

if err := f.Close(); err != nil {

118 +

if err = f.Close(); err != nil {

119 119

return

120 120

}

121 121

}()

@@ -150,15 +150,14 @@ func UncommentCode(filename, target, prefix string) error {

150 150

return nil

151 151

}

152 152

for {

153 -

_, err := out.WriteString(strings.TrimPrefix(scanner.Text(), prefix))

154 -

if err != nil {

153 +

if _, err = out.WriteString(strings.TrimPrefix(scanner.Text(), prefix)); err != nil {

155 154

return err

156 155

}

157 156

// Avoid writing a newline in case the previous line was the last in target.

158 157

if !scanner.Scan() {

159 158

break

160 159

}

161 -

if _, err := out.WriteString("\n"); err != nil {

160 +

if _, err = out.WriteString("\n"); err != nil {

162 161

return err

163 162

}

164 163

}

@@ -197,8 +196,7 @@ func CommentCode(filename, target, prefix string) error {

197 196

// Add the comment prefix to each line of the target code

198 197

scanner := bufio.NewScanner(bytes.NewBufferString(target))

199 198

for scanner.Scan() {

200 -

_, err := out.WriteString(prefix + scanner.Text() + "\n")

201 -

if err != nil {

199 +

if _, err = out.WriteString(prefix + scanner.Text() + "\n"); err != nil {

202 200

return err

203 201

}

204 202

}

Original file line number Diff line number Diff line change

@@ -33,7 +33,7 @@ var _ = Describe("Cover plugin util helpers", func() {

33 33

err := os.MkdirAll("testdata", 0o755)

34 34

Expect(err).NotTo(HaveOccurred())

35 35 36 -

if _, err := os.Stat(path); os.IsNotExist(err) {

36 +

if _, err = os.Stat(path); os.IsNotExist(err) {

37 37

err = os.WriteFile(path, []byte("exampleTarget"), 0o644)

38 38

Expect(err).NotTo(HaveOccurred())

39 39

}

You can’t perform that action at this time.


RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4