Run gofumpt -l -w ., remove vet and lint check in GitHub action

Author: bep

.github/workflows/test.yml

@@ -33,12 +33,8 @@ jobs:
       if: matrix.os != 'windows-latest'
       run: "diff <(gofmt -d .) <(printf '')"
       shell: bash
-    - name: Vet
-      run: go vet ./...
     - name: Staticcheck
       run: staticcheck ./...
-    - name: Lint
-      run: golint ./...
     - name: Test
       run: go test -race ./libsass -coverprofile=coverage.txt -covermode=atomic
     - name: Upload coverage

gen/main.go

@@ -59,9 +59,8 @@ func main() {
 		if err := ioutil.WriteFile(target, []byte(fmt.Sprintf(`#ifndef USE_LIBSASS_SRC
 #include "../../libsass_src/src/%s"
 #endif
-`, fi.Name())), 0644); err != nil {
+`, fi.Name())), 0o644); err != nil {
 			log.Fatal(err)
 		}
 	}
-
 }

internal/libsass/a__cgo_dev.go

@@ -3,6 +3,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 //
+//go:build dev
 // +build dev
 
 package libsass

internal/libsass/a__importer.go

@@ -19,6 +19,7 @@ package libsass
 //   return BridgeImport(currPath, prev_path, ci);
 // }
 import "C"
+
 import (
 	"sync"
 	"unsafe"
@@ -37,7 +38,7 @@ var importsStore = &idMap{
 func AddImportResolver(opts SassOptions, resolver ImportResolver) int {
 	i := importsStore.Set(resolver)
 	// This looks unsafe, but LibSass is using void* to store an int.
-	// TODO(bep) this prevents us from "fail on go vet errors" in Travis.
+	// TODO(bep) this prevents us from "fail on go vet errors" in GitHub action.
 	id := unsafe.Pointer(uintptr(i))
 
 	importers := C.sass_make_importer_list(1)

internal/libsass/a__libsass.go

@@ -9,6 +9,7 @@ package libsass
 // #include "sass/context.h"
 // #include "sass2scss.h"
 import "C"
+
 import (
 	"reflect"
 	"unsafe"
@@ -85,7 +86,6 @@ func SassContextGetSourceMapString(ctx SassContext) string {
 // SassDataContextGetContext function as declared in sass/context.h:61
 func SassDataContextGetContext(ctx SassDataContext) SassContext {
 	return (SassContext)(C.sass_data_context_get_context(ctx))
-
 }
 
 // SassDataContextGetOptions function as declared in sass/context.h:66
@@ -172,7 +172,6 @@ func SassOptionSetPrecision(o SassOptions, i int) {
 // SassOptionSetSourceComments function as declared in sass/context.h:93
 func SassOptionSetSourceComments(o SassOptions, b bool) {
 	C.sass_option_set_source_comments(o, C.bool(b))
-
 }
 
 // SassOptionSetSourceMapContents function as declared in sass/context.h:95
@@ -192,7 +191,6 @@ func SassOptionSetSourceMapFile(o SassOptions, s string) {
 // SassOptionSetSourceMapRoot function as declared in sass/context.h:106
 func SassOptionSetSourceMapRoot(o SassOptions, s string) {
 	C.sass_option_set_source_map_root(o, C.CString(s))
-
 }
 
 // SassToScss converts Sass to Scss using sass2scss.
@@ -206,5 +204,4 @@ func SassToScss(src string) string {
 	)
 
 	return C.GoString(chars)
-
 }

libsass/example_test.go

@@ -27,7 +27,6 @@ body {
   color: $primary-color;
 }
 `)
-
 	if err != nil {
 		log.Fatal(err)
 	}

libsass/transpiler_test.go

@@ -73,7 +73,6 @@ func TestTranspiler(t *testing.T) {
 				c.Assert(err, qt.IsNil)
 				c.Assert(result.CSS, qt.Equals, test.expect)
 			}
-
 		})
 
 	}
@@ -94,7 +93,6 @@ func TestError(t *testing.T) {
 }
 
 func TestSourceMapSettings(t *testing.T) {
-
 	c := qt.New(t)
 	src := `div { p { color: blue; } }`
 
@@ -132,11 +130,11 @@ func TestIncludePaths(t *testing.T) {
 
 	ioutil.WriteFile(colors, []byte(`
 $moo:       #f442d1 !default;
-`), 0644)
+`), 0o644)
 
 	ioutil.WriteFile(content, []byte(`
 content { color: #ccc; }
-`), 0644)
+`), 0o644)
 
 	c := qt.New(t)
 	src := `
@@ -157,11 +155,9 @@ div { p { color: $moo; } }`
 	result, err := transpiler.Execute(src)
 	c.Assert(err, qt.IsNil)
 	c.Assert(result.CSS, qt.Equals, "content{color:#ccc}div p{color:#f442d1}\n")
-
 }
 
 func TestConcurrentTranspile(t *testing.T) {
-
 	c := qt.New(t)
 
 	importResolver := func(url string, prev string) (string, string, bool) {
@@ -170,7 +166,8 @@ func TestConcurrentTranspile(t *testing.T) {
 
 	transpiler, err := New(Options{
 		OutputStyle:    CompressedStyle,
-		ImportResolver: importResolver})
+		ImportResolver: importResolver,
+	})
 
 	c.Assert(err, qt.IsNil)
 
@@ -216,7 +213,8 @@ func TestImportResolverConcurrent(t *testing.T) {
 			for j := 0; j < 100; j++ {
 				transpiler, err := New(Options{
 					OutputStyle:    CompressedStyle,
-					ImportResolver: createImportResolver(j)})
+					ImportResolver: createImportResolver(j),
+				})
 				c.Check(err, qt.IsNil)
 
 				src := `
@@ -236,7 +234,6 @@ div { p { width: $width; } }`
 		}()
 	}
 	wg.Wait()
-
 }
 
 func BenchmarkTranspile(b *testing.B) {
@@ -275,7 +272,6 @@ func BenchmarkTranspile(b *testing.B) {
 		t.src = sassSample
 		t.expect = sassSampleTranspiled
 		runBench(b, t)
-
 	})
 
 	b.Run("SCSS Parallel", func(b *testing.B) {
@@ -306,9 +302,7 @@ $color: #333;
 
 		t.expect = ".content-navigation{border-color:#333}\n"
 		runBench(b, t)
-
 	})
-
 }
 
 func TestParseOutputStyle(t *testing.T) {
@@ -319,5 +313,4 @@ func TestParseOutputStyle(t *testing.T) {
 	c.Assert(ParseOutputStyle("compressed"), qt.Equals, CompressedStyle)
 	c.Assert(ParseOutputStyle("EXPANDED"), qt.Equals, ExpandedStyle)
 	c.Assert(ParseOutputStyle("foo"), qt.Equals, NestedStyle)
-
 }