[pull] master from golang:master#125
Merged
Merged
Conversation
We have various small submodules in the repository, mostly used for code generation tools with external dependencies. Currently naming is fairly ad-hoc. Some name the module based on the path of the directory, while others use a single name like _gen. If a developer creates a go.work file creating a workspace containing these submodules (go work use -r .) [1], then all module names must be unique. Since CL 772102, we have two modules named _gen, so any operation after creating go.work immediately fails with a duplicate module error. Resolve this by using module paths based on the path to the directory. The load bearing changes here are modifying cmd/compile/internal/ssa/_gen/go.mod and/or simd/archsimd/_gen/go.mod so they no longer conflict, but I've changed all module paths to use the same naming scheme for consistency. Note that std and cmd get special treatment by cmd/go, so avoid those prefixes. e.g., the cmd/vet modules seem to ignore the Go language version when using a cmd/ prefix. [1] I found this issue because the build process for cross-references on https://cs.opensource.google/go does this and is currently broken. Change-Id: I8b3a351c16bd6d52192fb7b45186c38f6a6a6964 Reviewed-on: https://go-review.googlesource.com/c/go/+/798560 Auto-Submit: Michael Pratt <mpratt@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: David Chase <drchase@google.com>
As far as I can tell, this is dead code. Change-Id: Ibd1c30197a785ade97bb2c98a9cfdd5b6a6a6964 Reviewed-on: https://go-review.googlesource.com/c/go/+/799020 LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Michael Pratt <mpratt@google.com> Reviewed-by: David Chase <drchase@google.com>
CL 797880 changed Root to handle trailing slashes in
paths and added TestRootConsistencyRemoveAll.
However, this test is failing on Plan 9 because the "noat"
implementation of RemoveAll disagrees with Root.RemoveAll
when a path ends in a slash and its target is not a
directory. Root.RemoveAll strips the trailing slash and
removes the file, while os.RemoveAll leaves the slash in
place. On Plan 9, Remove and Lstat then fail on the
slash-terminated path, so os.RemoveAll returns an error
instead.
This change strips trailing slashes in the "noat"
implementation of RemoveAll, so RemoveAll("not_a_directory/")
removes the file and returns nil, and remains consistent
with the "at" implementation and Root.RemoveAll.
Fixes #80319.
Change-Id: I5c47ccd239c629da78772f39a831cccf8c9d1500
Reviewed-on: https://go-review.googlesource.com/c/go/+/798721
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Richard Miller <millerresearch@gmail.com>
Reviewed-by: Damien Neil <dneil@google.com>
Auto-Submit: Damien Neil <dneil@google.com>
LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )