shadowing cleanup

Drew O'Meara · Drew O'Meara · commit 36b1018a0c41 · 2022-01-10T11:38:33.000-06:00
diff --git a/modules/runtime.go b/modules/runtime.go
@@ -134,8 +134,7 @@ func (ctx *ctx) ResolveAndCompile(pathname string, opts py.CompileOpts) (py.Comp
 			}
 			out.SrcPathname = fpath
 		case ".pyc":
-			var file *os.File
-			file, err = os.Open(fpath)
+			file, err := os.Open(fpath)
 			if err != nil {
 				return false, py.ExceptionNewf(py.OSError, "Error opening %q: %w", fpath, err)
 			}
@@ -171,8 +170,8 @@ func resolveRunPath(runPath string, opts py.CompileOpts, pathObjs []py.Object, t
 	runPath = strings.TrimSuffix(runPath, "/")
 
 	var (
-		err error
-		cwd string
+		err  error
+		cwd  string
 		cont = true
 	)
 

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ func (ctx *ctx) ResolveAndCompile(pathname string, opts py.CompileOpts) (py.Comp`
`134`	`134`	`}`
`135`	`135`	`out.SrcPathname = fpath`
`136`	`136`	`case ".pyc":`
`137`		`- var file *os.File`
`138`		`- file, err = os.Open(fpath)`
	`137`	`+ file, err := os.Open(fpath)`
`139`	`138`	`if err != nil {`
`140`	`139`	`return false, py.ExceptionNewf(py.OSError, "Error opening %q: %w", fpath, err)`
`141`	`140`	`}`
`@@ -171,8 +170,8 @@ func resolveRunPath(runPath string, opts py.CompileOpts, pathObjs []py.Object, t`
`171`	`170`	`runPath = strings.TrimSuffix(runPath, "/")`
`172`	`171`
`173`	`172`	`var (`
`174`		`- err error`
`175`		`- cwd string`
	`173`	`+ err error`
	`174`	`+ cwd string`
`176`	`175`	`cont = true`
`177`	`176`	`)`
`178`	`177`