From 4b9b38238b16276e21ed39f8ffe1f6ec507fb141 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Thu, 19 Sep 2024 10:42:30 +0100 Subject: [PATCH] change package name for tools and remove unnecessary doc.go Signed-off-by: Benjamin Wang --- tools/mod/doc.go | 22 ---------------------- tools/mod/libs.go | 2 +- tools/mod/tools.go | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 tools/mod/doc.go diff --git a/tools/mod/doc.go b/tools/mod/doc.go deleted file mode 100644 index e9cd697f803..00000000000 --- a/tools/mod/doc.go +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2024 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// As this directory implements the pattern for tracking tool dependencies as documented here: -// https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module, it doesn't -// contain any valid go source code in the directory directly. This would break scripts for -// unit testing, golangci-lint, and coverage calculation. -// -// Thus, to ensure tools to run normally, we've added this empty file. - -package mod diff --git a/tools/mod/libs.go b/tools/mod/libs.go index fd392d55a9f..3fe68272d5b 100644 --- a/tools/mod/libs.go +++ b/tools/mod/libs.go @@ -18,7 +18,7 @@ // https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module // for etcd. Thanks to this file 'go mod tidy' does not removes dependencies. -package libs +package mod import ( _ "github.com/gogo/protobuf/proto" diff --git a/tools/mod/tools.go b/tools/mod/tools.go index ce9af775178..3f9ccca4204 100644 --- a/tools/mod/tools.go +++ b/tools/mod/tools.go @@ -18,7 +18,7 @@ // https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module // for etcd. Thanks to this file 'go mod tidy' does not removes dependencies. -package tools +package mod import ( _ "github.com/alexfalkowski/gocovmerge"