[pull] master from golang:master#59
Merged
Merged
Conversation
…halDecode It is reasonable to allow changing jsontext options via a MarshalEncode or UnmarshalDecode call. Such changes are scoped to the duration of the call and the previous options on the Encoder/Decoder itself are restored after the call returns. One such use case for this is to have different AllowInvalidUTF8 or AllowDuplicateNames settings on different parts of the JSON value. Updates #79559 Fixes #76440 Change-Id: I5517b10fc4a81dc54f5a227ae1b4d2514a2418ee Reviewed-on: https://go-review.googlesource.com/c/go/+/781600 Reviewed-by: Damien Neil <dneil@google.com> LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Pratt <mpratt@google.com>
os.Chdir notifies the testlog hook with the new working directory, but (*File).Chdir does not, so cmd/go's test cache loses track of the cwd when a test uses (*File).Chdir to restore the previous directory (as testing.T.Chdir does in its cleanup). Subsequent relative paths from later tests in the same package are then resolved against the wrong directory in computeTestInputsID, and the cache fails to invalidate when those files change. Fix it by emitting the same testlog Chdir entry from (*File).Chdir after a successful Fchdir, mirroring os.Chdir. Fixes #79019. Change-Id: I7099d3a1d2ce3e5f4882a0e93c4d642f23f7eca8 Reviewed-on: https://go-review.googlesource.com/c/go/+/771960 LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Michael Pratt <mpratt@google.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 : )