diff options
| author | Russ Cox <rsc@golang.org> | 2020-07-18 23:50:48 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2020-10-23 00:22:00 +0000 |
| commit | 400581b8b008ece8d0df34f54f281d365a175dba (patch) | |
| tree | 096955e1ffd30257ca7c3739467098f012aefbb3 /src/go | |
| parent | 67bce7c1cf6540a853c6b8a9721e381c8258d7dc (diff) | |
| download | go-400581b8b008ece8d0df34f54f281d365a175dba.tar.gz go-400581b8b008ece8d0df34f54f281d365a175dba.zip | |
embed: implement FS
embed.FS is the implementation of embedded file trees, providing
an fs.FS for each embed.FS variable.
Tests are in a follow-up CL, in the package embed/internal/embedtest.
(They can only be written once the toolchain can initialize one of these,
which requires changes to cmd/compile and cmd/go.)
For #41191.
Change-Id: Ieb0ead1d305cdac3d5d4e11772dca75740a72730
Reviewed-on: https://go-review.googlesource.com/c/go/+/243942
Trust: Russ Cox <rsc@golang.org>
Trust: Jay Conrod <jayconrod@google.com>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Diffstat (limited to 'src/go')
| -rw-r--r-- | src/go/build/read_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/go/build/read_test.go b/src/go/build/read_test.go index dc75c9f202..9264d2606f 100644 --- a/src/go/build/read_test.go +++ b/src/go/build/read_test.go @@ -236,23 +236,23 @@ var readEmbedTests = []struct { nil, }, { - "package p\nimport \"embed\"\nvar i int\n//go:embed x y z\nvar files embed.Files", + "package p\nimport \"embed\"\nvar i int\n//go:embed x y z\nvar files embed.FS", []string{"x", "y", "z"}, }, { - "package p\nimport \"embed\"\nvar i int\n//go:embed x \"\\x79\" `z`\nvar files embed.Files", + "package p\nimport \"embed\"\nvar i int\n//go:embed x \"\\x79\" `z`\nvar files embed.FS", []string{"x", "y", "z"}, }, { - "package p\nimport \"embed\"\nvar i int\n//go:embed x y\n//go:embed z\nvar files embed.Files", + "package p\nimport \"embed\"\nvar i int\n//go:embed x y\n//go:embed z\nvar files embed.FS", []string{"x", "y", "z"}, }, { - "package p\nimport \"embed\"\nvar i int\n\t //go:embed x y\n\t //go:embed z\n\t var files embed.Files", + "package p\nimport \"embed\"\nvar i int\n\t //go:embed x y\n\t //go:embed z\n\t var files embed.FS", []string{"x", "y", "z"}, }, { - "package p\nimport \"embed\"\n//go:embed x y z\nvar files embed.Files", + "package p\nimport \"embed\"\n//go:embed x y z\nvar files embed.FS", []string{"x", "y", "z"}, }, { @@ -260,7 +260,7 @@ var readEmbedTests = []struct { nil, }, { - "package p\n//go:embed x y z\nvar files embed.Files", // no import, no scan + "package p\n//go:embed x y z\nvar files embed.FS", // no import, no scan nil, }, } |