Fix formatting
gofmt -w . Change-Id: If9cf0b7bd810f899edffcd2edf361fa83245bd2a
This commit is contained in:
parent
efe578a605
commit
63d5d4d9e4
5 changed files with 7 additions and 7 deletions
|
@ -21,8 +21,8 @@ import (
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime/pprof"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"runtime/pprof"
|
||||||
|
|
||||||
"github.com/google/blueprint"
|
"github.com/google/blueprint"
|
||||||
"github.com/google/blueprint/deptools"
|
"github.com/google/blueprint/deptools"
|
||||||
|
|
|
@ -132,7 +132,7 @@ func parseDollarStartState(state *parseState, i int, r rune) (stateFunc, error)
|
||||||
r >= '0' && r <= '9', r == '_', r == '-':
|
r >= '0' && r <= '9', r == '_', r == '-':
|
||||||
// The beginning of a of the variable name. Output the string and
|
// The beginning of a of the variable name. Output the string and
|
||||||
// keep going.
|
// keep going.
|
||||||
state.pushString(state.str[state.stringStart:i-1])
|
state.pushString(state.str[state.stringStart : i-1])
|
||||||
return parseDollarState, nil
|
return parseDollarState, nil
|
||||||
|
|
||||||
case r == '$':
|
case r == '$':
|
||||||
|
@ -143,7 +143,7 @@ func parseDollarStartState(state *parseState, i int, r rune) (stateFunc, error)
|
||||||
case r == '{':
|
case r == '{':
|
||||||
// This is a bracketted variable name (e.g. "${blah.blah}"). Output
|
// This is a bracketted variable name (e.g. "${blah.blah}"). Output
|
||||||
// the string and keep going.
|
// the string and keep going.
|
||||||
state.pushString(state.str[state.stringStart:i-1])
|
state.pushString(state.str[state.stringStart : i-1])
|
||||||
state.varStart = i + 1
|
state.varStart = i + 1
|
||||||
return parseBracketsState, nil
|
return parseBracketsState, nil
|
||||||
|
|
||||||
|
|
|
@ -58,12 +58,12 @@ var ninjaParseTestCases = []struct {
|
||||||
{
|
{
|
||||||
input: "$foo${bar}",
|
input: "$foo${bar}",
|
||||||
vars: []string{"foo", "bar"},
|
vars: []string{"foo", "bar"},
|
||||||
strs: []string{"","", ""},
|
strs: []string{"", "", ""},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "$foo$$",
|
input: "$foo$$",
|
||||||
vars: []string{"foo"},
|
vars: []string{"foo"},
|
||||||
strs: []string{"","$$"},
|
strs: []string{"", "$$"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "foo bar",
|
input: "foo bar",
|
||||||
|
|
|
@ -563,7 +563,7 @@ func (p *poolFunc) String() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
type builtinPool struct {
|
type builtinPool struct {
|
||||||
name_ string
|
name_ string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *builtinPool) packageContext() *PackageContext {
|
func (p *builtinPool) packageContext() *PackageContext {
|
||||||
|
|
|
@ -63,7 +63,7 @@ func isWild(pattern string) bool {
|
||||||
func GlobPatternList(patterns []string, prefix string) (globedList []string, depDirs []string, err error) {
|
func GlobPatternList(patterns []string, prefix string) (globedList []string, depDirs []string, err error) {
|
||||||
var (
|
var (
|
||||||
matches []string
|
matches []string
|
||||||
deps []string
|
deps []string
|
||||||
)
|
)
|
||||||
|
|
||||||
globedList = make([]string, 0)
|
globedList = make([]string, 0)
|
||||||
|
|
Loading…
Reference in a new issue