Skip to content

Commit

Permalink
vendor: migrate from govendor to go mod vendor
Browse files Browse the repository at this point in the history
The rsc.io/pdf package was added to the vendor directory 5 years ago
in CL 13968, back when the vendor directory was a part of the Go 1.5
vendor experiment.

The vendor.json file was written by hand in a format compatible with
the govendor tool. By now, that tool has been deprecated in favor of
the go command in module mode.

A go.mod file requiring a newer version of rsc.io/pdf was added in
CL 167137. Modify the vendor directory to use the newer rsc.io/pdf
version by recreating vendor directory using go command in Go 1.14:

	rm -rf vendor
	go mod vendor

It's possible the vendor directory isn't needed anymore and can be
safely deleted in a future change. The scope of this CL is only to
migrate from the deprecated govendor tool to the supported go tool;
deleting the vendor directory can still be done in a future change.

Remove the explicit mention of Go 1.5 vendor experiment from README
since it's old, and not relevant by now. Add a contributing section.

Updates golang/go#30228
Updates golang/go#33848

Change-Id: I95de95a3b2d81faf7235c675e5b8d425141f8d7a
Reviewed-on: https://go-review.googlesource.com/c/arch/+/222538
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
  • Loading branch information
dmitshur committed Mar 12, 2020
1 parent 368ea8f commit 69f17b2
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 30 deletions.
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,11 @@
This repository holds machine architecture information used by the Go toolchain.
The parts needed in the main Go repository are copied in.

This repository requires Go 1.5+ with the vendor experiment enabled.
## Report Issues / Send Patches

This repository uses Gerrit for code changes. To learn how to submit changes to
this repository, see https://golang.org/doc/contribute.html.

The main issue tracker for the arch repository is located at
https://github.com/golang/go/issues. Prefix your issue with "x/arch:" in the
subject line, so it is easy to find.
2 changes: 2 additions & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# rsc.io/pdf v0.1.1
rsc.io/pdf
4 changes: 0 additions & 4 deletions vendor/rsc.io/pdf/lex.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions vendor/rsc.io/pdf/page.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions vendor/rsc.io/pdf/ps.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions vendor/rsc.io/pdf/read.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions vendor/vendor.json

This file was deleted.

0 comments on commit 69f17b2

Please sign in to comment.