Просмотр исходного кода

Merge pull request #299 from rogpeppe/009-gofmt

gofmt
Roger Peppe 8 лет назад
Родитель
Сommit
0e4404da71
2 измененных файлов с 12 добавлено и 12 удалено
  1. 3 3
      emitterc.go
  2. 9 9
      example_embedded_test.go

+ 3 - 3
emitterc.go

@@ -995,9 +995,9 @@ func yaml_emitter_analyze_scalar(emitter *yaml_emitter_t, value []byte) bool {
 		space_break    = false
 
 		preceded_by_whitespace = false
-		followed_by_whitespace  = false
-		previous_space          = false
-		previous_break          = false
+		followed_by_whitespace = false
+		previous_space         = false
+		previous_break         = false
 	)
 
 	emitter.scalar_data.value = value

+ 9 - 9
example_embedded_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-        "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 )
 
 // An example showing how to unmarshal embedded
@@ -17,8 +17,8 @@ type StructA struct {
 type StructB struct {
 	// Embedded structs are not treated as embedded in YAML by default. To do that,
 	// add the ",inline" annotation below
-	StructA   `yaml:",inline"`
-	B string `yaml:"b"`
+	StructA `yaml:",inline"`
+	B       string `yaml:"b"`
 }
 
 var data = `
@@ -31,11 +31,11 @@ func ExampleUnmarshal_embedded() {
 
 	err := yaml.Unmarshal([]byte(data), &b)
 	if err != nil {
-		log.Fatal("cannot unmarshal data: %v", err)
+		log.Fatalf("cannot unmarshal data: %v", err)
 	}
-        fmt.Println(b.A)
-        fmt.Println(b.B)
-        // Output:
-        // a string from struct A
-        // a string from struct B
+	fmt.Println(b.A)
+	fmt.Println(b.B)
+	// Output:
+	// a string from struct A
+	// a string from struct B
 }