tools/src: Fix up paths post-tint-merge

Bug: dawn:1339
Change-Id: Icdc15e4d80ed4e65b343294eb3bc22a417fcf490
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86062
Auto-Submit: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton
2022-04-07 17:50:24 +00:00
committed by Dawn LUCI CQ
parent 62a1d7104f
commit 59e96fe55e
28 changed files with 187 additions and 48 deletions

View File

@@ -25,7 +25,7 @@ import (
"path/filepath"
"time"
"dawn.googlesource.com/tint/tools/src/bench"
"dawn.googlesource.com/dawn/tools/src/bench"
)
var (

View File

@@ -20,7 +20,7 @@ import (
"fmt"
"strings"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
)
// AST is the parsed syntax tree of the intrinsic definition file

View File

@@ -17,9 +17,9 @@ package gen
import (
"fmt"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem"
"dawn.googlesource.com/tint/tools/src/list"
"dawn.googlesource.com/tint/tools/src/lut"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
"dawn.googlesource.com/dawn/tools/src/list"
"dawn.googlesource.com/dawn/tools/src/lut"
)
// BuiltinTable holds data specific to the intrinsic_table.inl.tmpl template

View File

@@ -22,7 +22,7 @@ import (
"text/template"
"unicode"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
)
type generator struct {

View File

@@ -20,8 +20,8 @@ import (
"fmt"
"strings"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem"
"dawn.googlesource.com/tint/tools/src/fileutils"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
"dawn.googlesource.com/dawn/tools/src/fileutils"
)
// Permuter generates permutations of intrinsic overloads

View File

@@ -20,7 +20,7 @@ import (
"fmt"
"unicode"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
)
// Lex produces a list of tokens for the given source code

View File

@@ -18,8 +18,8 @@ import (
"fmt"
"testing"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/lexer"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/lexer"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
)
func TestLexTokens(t *testing.T) {

View File

@@ -25,11 +25,11 @@ import (
"path/filepath"
"strings"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/gen"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/parser"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/resolver"
"dawn.googlesource.com/tint/tools/src/fileutils"
"dawn.googlesource.com/tint/tools/src/glob"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/gen"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/resolver"
"dawn.googlesource.com/dawn/tools/src/fileutils"
"dawn.googlesource.com/dawn/tools/src/glob"
)
const defProjectRelPath = "src/tint/builtins.def"
@@ -82,8 +82,8 @@ func run() error {
// Recursively find all the template files in the <tint>/src directory
files, err := glob.Scan(projectRoot, glob.MustParseConfig(`{
"paths": [{"include": [
"src/**.tmpl",
"test/**.tmpl"
"src/tint/**.tmpl",
"test/tint/**.tmpl"
]}]
}`))
if err != nil {

View File

@@ -19,9 +19,9 @@ package parser
import (
"fmt"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/lexer"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/lexer"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
)
// Parse produces a list of tokens for the given source code

View File

@@ -17,8 +17,8 @@ package parser_test
import (
"testing"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/parser"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser"
)
func TestParser(t *testing.T) {

View File

@@ -18,9 +18,9 @@ import (
"fmt"
"sort"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
)
type resolver struct {

View File

@@ -19,8 +19,8 @@ import (
"strings"
"testing"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/parser"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/resolver"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/resolver"
)
func TestResolver(t *testing.T) {

View File

@@ -17,7 +17,7 @@ package sem
import (
"fmt"
"dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast"
"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
)
// Sem is the root of the semantic tree

View File

@@ -26,7 +26,7 @@ import (
"regexp"
"strings"
"dawn.googlesource.com/tint/tools/src/substr"
"dawn.googlesource.com/dawn/tools/src/substr"
)
func main() {

View File

@@ -23,7 +23,7 @@ import (
"regexp"
"time"
"dawn.googlesource.com/tint/tools/src/gerrit"
"dawn.googlesource.com/dawn/tools/src/gerrit"
)
const yyyymmdd = "2006-01-02"

View File

@@ -32,8 +32,8 @@ import (
"strings"
"time"
"dawn.googlesource.com/tint/tools/src/bench"
"dawn.googlesource.com/tint/tools/src/git"
"dawn.googlesource.com/dawn/tools/src/bench"
"dawn.googlesource.com/dawn/tools/src/git"
"github.com/andygrunwald/go-gerrit"
"github.com/go-git/go-git/v5/plumbing/transport"
"github.com/go-git/go-git/v5/plumbing/transport/http"

View File

@@ -22,7 +22,7 @@ import (
"strings"
"time"
"dawn.googlesource.com/tint/tools/src/gerrit"
"dawn.googlesource.com/dawn/tools/src/gerrit"
)
const yyyymmdd = "2006-01-02"

View File

@@ -30,8 +30,8 @@ import (
"time"
"unicode/utf8"
"dawn.googlesource.com/tint/tools/src/fileutils"
"dawn.googlesource.com/tint/tools/src/glob"
"dawn.googlesource.com/dawn/tools/src/fileutils"
"dawn.googlesource.com/dawn/tools/src/glob"
"github.com/fatih/color"
"github.com/sergi/go-diff/diffmatchpatch"
)

View File

@@ -34,8 +34,8 @@ import (
"sync"
"time"
"dawn.googlesource.com/tint/tools/src/fileutils"
"dawn.googlesource.com/tint/tools/src/glob"
"dawn.googlesource.com/dawn/tools/src/fileutils"
"dawn.googlesource.com/dawn/tools/src/glob"
)
var (