diff --git a/decode_test.go b/decode_test.go index 6ca4a06f..45d0cf20 100644 --- a/decode_test.go +++ b/decode_test.go @@ -18,8 +18,8 @@ import ( ) func WithTomlNext(f func()) { - tomlNext = true - defer func() { tomlNext = false }() + os.Setenv("BURNTSUSHI_TOML_110", "") + defer func() { os.Unsetenv("BURNTSUSHI_TOML_110") }() f() } diff --git a/parse.go b/parse.go index 2aeb4f16..ceceb1d1 100644 --- a/parse.go +++ b/parse.go @@ -11,10 +11,7 @@ import ( "github.com/BurntSushi/toml/internal" ) -var tomlNext = func() bool { - _, ok := os.LookupEnv("BURNTSUSHI_TOML_110") - return ok -}() +var tomlNext bool type parser struct { lx *lexer @@ -35,6 +32,9 @@ type keyInfo struct { } func parse(data string) (p *parser, err error) { + _, ok := os.LookupEnv("BURNTSUSHI_TOML_110") + tomlNext = ok + defer func() { if r := recover(); r != nil { if pErr, ok := r.(ParseError); ok {