From c18d8d6968cb175703942631f0094ffb415f51f4 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 2 May 2022 23:22:45 +0800 Subject: [PATCH] Remove legacy `+build:` constraint (#19582) Go 1.17 and later use modern `//go:build` constraints, the old `// +build:` constraints should be removed. --- build.go | 1 - build/code-batch-process.go | 1 - build/generate-bindata.go | 1 - build/generate-emoji.go | 1 - build/generate-gitignores.go | 1 - build/generate-licenses.go | 1 - build/gitea-format-imports.go | 1 - build/gocovmerge.go | 1 - cmd/embedded.go | 1 - cmd/embedded_stub.go | 1 - modules/auth/pam/pam.go | 1 - modules/auth/pam/pam_stub.go | 1 - modules/auth/pam/pam_test.go | 1 - modules/avatar/identicon/identicon_test.go | 1 - modules/git/blob_gogit.go | 1 - modules/git/blob_nogogit.go | 1 - modules/git/command_race_test.go | 1 - modules/git/commit_convert_gogit.go | 1 - modules/git/commit_info_gogit.go | 1 - modules/git/commit_info_nogogit.go | 1 - modules/git/last_commit_cache_gogit.go | 1 - modules/git/last_commit_cache_nogogit.go | 1 - modules/git/notes_gogit.go | 1 - modules/git/notes_nogogit.go | 1 - modules/git/parse_gogit.go | 1 - modules/git/parse_gogit_test.go | 1 - modules/git/parse_nogogit.go | 1 - modules/git/parse_nogogit_test.go | 1 - modules/git/pipeline/lfs.go | 1 - modules/git/pipeline/lfs_nogogit.go | 1 - modules/git/repo_base_gogit.go | 1 - modules/git/repo_base_nogogit.go | 1 - modules/git/repo_blob_gogit.go | 1 - modules/git/repo_blob_nogogit.go | 1 - modules/git/repo_branch_gogit.go | 1 - modules/git/repo_branch_nogogit.go | 1 - modules/git/repo_commit_gogit.go | 1 - modules/git/repo_commit_nogogit.go | 1 - modules/git/repo_commitgraph_gogit.go | 1 - modules/git/repo_language_stats_gogit.go | 1 - modules/git/repo_language_stats_nogogit.go | 1 - modules/git/repo_language_stats_test.go | 1 - modules/git/repo_ref_gogit.go | 1 - modules/git/repo_ref_nogogit.go | 1 - modules/git/repo_tag_gogit.go | 1 - modules/git/repo_tag_nogogit.go | 1 - modules/git/repo_tree_gogit.go | 1 - modules/git/repo_tree_nogogit.go | 1 - modules/git/sha1_gogit.go | 1 - modules/git/sha1_nogogit.go | 1 - modules/git/signature_gogit.go | 1 - modules/git/signature_nogogit.go | 1 - modules/git/tree_blob_gogit.go | 1 - modules/git/tree_blob_nogogit.go | 1 - modules/git/tree_entry_gogit.go | 1 - modules/git/tree_entry_nogogit.go | 1 - modules/git/tree_entry_test.go | 1 - modules/git/tree_gogit.go | 1 - modules/git/tree_nogogit.go | 1 - modules/graceful/manager_unix.go | 1 - modules/graceful/manager_windows.go | 1 - modules/graceful/net_unix.go | 1 - modules/graceful/net_windows.go | 1 - modules/graceful/restart_unix.go | 1 - modules/lfs/pointer_scanner_gogit.go | 1 - modules/lfs/pointer_scanner_nogogit.go | 1 - modules/migration/schemas_bindata.go | 1 - modules/migration/schemas_dynamic.go | 1 - modules/migration/schemas_static.go | 1 - modules/options/dynamic.go | 1 - modules/options/options_bindata.go | 1 - modules/options/static.go | 1 - modules/public/public_bindata.go | 1 - modules/public/serve_dynamic.go | 1 - modules/public/serve_static.go | 1 - modules/setting/database_sqlite.go | 1 - modules/svg/discover_bindata.go | 1 - modules/svg/discover_nobindata.go | 1 - modules/templates/dynamic.go | 1 - modules/templates/static.go | 1 - modules/templates/templates_bindata.go | 1 - routers/api/v1/auth.go | 1 - routers/private/manager_unix.go | 1 - routers/private/manager_windows.go | 1 - routers/web/auth.go | 1 - tools/fuzz.go | 1 - 86 files changed, 86 deletions(-) diff --git a/build.go b/build.go index aa561413407..d379745c6df 100644 --- a/build.go +++ b/build.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build vendor -// +build vendor package main diff --git a/build/code-batch-process.go b/build/code-batch-process.go index b2290af7715..0f8dbd40feb 100644 --- a/build/code-batch-process.go +++ b/build/code-batch-process.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main diff --git a/build/generate-bindata.go b/build/generate-bindata.go index 7fdf9d76161..ab81dd89382 100644 --- a/build/generate-bindata.go +++ b/build/generate-bindata.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main diff --git a/build/generate-emoji.go b/build/generate-emoji.go index 2f3536342d4..a22f2a4571e 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go index 0f7d719d40b..1e09c83a6a7 100644 --- a/build/generate-gitignores.go +++ b/build/generate-gitignores.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/build/generate-licenses.go b/build/generate-licenses.go index 0f9b9f369fe..02b41a229a4 100644 --- a/build/generate-licenses.go +++ b/build/generate-licenses.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/build/gitea-format-imports.go b/build/gitea-format-imports.go index 67c8397b2d9..c685ae68eee 100644 --- a/build/gitea-format-imports.go +++ b/build/gitea-format-imports.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main diff --git a/build/gocovmerge.go b/build/gocovmerge.go index 1d2652129f9..dfe70efdad4 100644 --- a/build/gocovmerge.go +++ b/build/gocovmerge.go @@ -7,7 +7,6 @@ // merges them into one profile //go:build ignore -// +build ignore package main diff --git a/cmd/embedded.go b/cmd/embedded.go index 2930e5d3077..30fc7103d83 100644 --- a/cmd/embedded.go +++ b/cmd/embedded.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package cmd diff --git a/cmd/embedded_stub.go b/cmd/embedded_stub.go index 0e9e3e6ec3e..26228256f2a 100644 --- a/cmd/embedded_stub.go +++ b/cmd/embedded_stub.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !bindata -// +build !bindata package cmd diff --git a/modules/auth/pam/pam.go b/modules/auth/pam/pam.go index 1acd0b112c6..39e93d71620 100644 --- a/modules/auth/pam/pam.go +++ b/modules/auth/pam/pam.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build pam -// +build pam package pam diff --git a/modules/auth/pam/pam_stub.go b/modules/auth/pam/pam_stub.go index 815ccf2b0e2..414d7631b5c 100644 --- a/modules/auth/pam/pam_stub.go +++ b/modules/auth/pam/pam_stub.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !pam -// +build !pam package pam diff --git a/modules/auth/pam/pam_test.go b/modules/auth/pam/pam_test.go index d6d78a748b7..08565d2f312 100644 --- a/modules/auth/pam/pam_test.go +++ b/modules/auth/pam/pam_test.go @@ -1,5 +1,4 @@ //go:build pam -// +build pam // Copyright 2021 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style diff --git a/modules/avatar/identicon/identicon_test.go b/modules/avatar/identicon/identicon_test.go index ee44c95139a..44635fbb3bd 100644 --- a/modules/avatar/identicon/identicon_test.go +++ b/modules/avatar/identicon/identicon_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build test_avatar_identicon -// +build test_avatar_identicon package identicon diff --git a/modules/git/blob_gogit.go b/modules/git/blob_gogit.go index ef7a90c3f40..2a2b51e422f 100644 --- a/modules/git/blob_gogit.go +++ b/modules/git/blob_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go index aabf1b34ade..211c1885597 100644 --- a/modules/git/blob_nogogit.go +++ b/modules/git/blob_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/command_race_test.go b/modules/git/command_race_test.go index 9eb29fcfab5..ae2acc3a5ad 100644 --- a/modules/git/command_race_test.go +++ b/modules/git/command_race_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build race -// +build race package git diff --git a/modules/git/commit_convert_gogit.go b/modules/git/commit_convert_gogit.go index b328b3c0edf..bb9d3bf8cef 100644 --- a/modules/git/commit_convert_gogit.go +++ b/modules/git/commit_convert_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/commit_info_gogit.go b/modules/git/commit_info_gogit.go index ab6e7381036..91a1804db5c 100644 --- a/modules/git/commit_info_gogit.go +++ b/modules/git/commit_info_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go index 347ad7d0590..f430c672f88 100644 --- a/modules/git/commit_info_nogogit.go +++ b/modules/git/commit_info_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/last_commit_cache_gogit.go b/modules/git/last_commit_cache_gogit.go index 06e85a6db2a..8897000350d 100644 --- a/modules/git/last_commit_cache_gogit.go +++ b/modules/git/last_commit_cache_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/last_commit_cache_nogogit.go b/modules/git/last_commit_cache_nogogit.go index 5315c0a152d..030d5486b63 100644 --- a/modules/git/last_commit_cache_nogogit.go +++ b/modules/git/last_commit_cache_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/notes_gogit.go b/modules/git/notes_gogit.go index b1e5e453e4f..76bc828957b 100644 --- a/modules/git/notes_gogit.go +++ b/modules/git/notes_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go index bbc8ee1371d..e3f0a3fee9e 100644 --- a/modules/git/notes_nogogit.go +++ b/modules/git/notes_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/parse_gogit.go b/modules/git/parse_gogit.go index c42e32929e4..409432c5d6a 100644 --- a/modules/git/parse_gogit.go +++ b/modules/git/parse_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/parse_gogit_test.go b/modules/git/parse_gogit_test.go index c27f5172d5e..075de6d25de 100644 --- a/modules/git/parse_gogit_test.go +++ b/modules/git/parse_gogit_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/parse_nogogit.go b/modules/git/parse_nogogit.go index dd5554b5dd7..6dc49009928 100644 --- a/modules/git/parse_nogogit.go +++ b/modules/git/parse_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/parse_nogogit_test.go b/modules/git/parse_nogogit_test.go index d6d6f3868c0..483f96e9a7f 100644 --- a/modules/git/parse_nogogit_test.go +++ b/modules/git/parse_nogogit_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/pipeline/lfs.go b/modules/git/pipeline/lfs.go index 1b64b672e45..18cce342895 100644 --- a/modules/git/pipeline/lfs.go +++ b/modules/git/pipeline/lfs.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package pipeline diff --git a/modules/git/pipeline/lfs_nogogit.go b/modules/git/pipeline/lfs_nogogit.go index 31c10c6002f..a2b5dd0c969 100644 --- a/modules/git/pipeline/lfs_nogogit.go +++ b/modules/git/pipeline/lfs_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package pipeline diff --git a/modules/git/repo_base_gogit.go b/modules/git/repo_base_gogit.go index 059f75fb3c0..cd2ca25dfba 100644 --- a/modules/git/repo_base_gogit.go +++ b/modules/git/repo_base_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_base_nogogit.go b/modules/git/repo_base_nogogit.go index c4a0e82c89d..df24d952a8f 100644 --- a/modules/git/repo_base_nogogit.go +++ b/modules/git/repo_base_nogogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_blob_gogit.go b/modules/git/repo_blob_gogit.go index b11e9f58fe9..5640011f4ae 100644 --- a/modules/git/repo_blob_gogit.go +++ b/modules/git/repo_blob_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_blob_nogogit.go b/modules/git/repo_blob_nogogit.go index 775b3835dd5..44ba0a36b1b 100644 --- a/modules/git/repo_blob_nogogit.go +++ b/modules/git/repo_blob_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_branch_gogit.go b/modules/git/repo_branch_gogit.go index bf3eb857b95..ecedb56686d 100644 --- a/modules/git/repo_branch_gogit.go +++ b/modules/git/repo_branch_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_branch_nogogit.go b/modules/git/repo_branch_nogogit.go index 4393db10f95..3aed4abdf35 100644 --- a/modules/git/repo_branch_nogogit.go +++ b/modules/git/repo_branch_nogogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go index f3504f25d87..9333b0d7b75 100644 --- a/modules/git/repo_commit_gogit.go +++ b/modules/git/repo_commit_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go index c9afe35b1a2..e528af0ffb8 100644 --- a/modules/git/repo_commit_nogogit.go +++ b/modules/git/repo_commit_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_commitgraph_gogit.go b/modules/git/repo_commitgraph_gogit.go index 84a2edb664b..6b00a4fdc43 100644 --- a/modules/git/repo_commitgraph_gogit.go +++ b/modules/git/repo_commitgraph_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_language_stats_gogit.go b/modules/git/repo_language_stats_gogit.go index 037ec41ec6c..3c9f026b7ac 100644 --- a/modules/git/repo_language_stats_gogit.go +++ b/modules/git/repo_language_stats_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_language_stats_nogogit.go b/modules/git/repo_language_stats_nogogit.go index adb11dd8fa6..41b176f8169 100644 --- a/modules/git/repo_language_stats_nogogit.go +++ b/modules/git/repo_language_stats_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_language_stats_test.go b/modules/git/repo_language_stats_test.go index 6a4e23f99b0..0234c77c0be 100644 --- a/modules/git/repo_language_stats_test.go +++ b/modules/git/repo_language_stats_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_ref_gogit.go b/modules/git/repo_ref_gogit.go index 9f0e11366f6..d11c58e005e 100644 --- a/modules/git/repo_ref_gogit.go +++ b/modules/git/repo_ref_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_ref_nogogit.go b/modules/git/repo_ref_nogogit.go index 40e8a247c74..d766a8cac31 100644 --- a/modules/git/repo_ref_nogogit.go +++ b/modules/git/repo_ref_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_tag_gogit.go b/modules/git/repo_tag_gogit.go index 5c87e914c06..c6dec289878 100644 --- a/modules/git/repo_tag_gogit.go +++ b/modules/git/repo_tag_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_tag_nogogit.go b/modules/git/repo_tag_nogogit.go index f2da7d88572..8d44db0a2e1 100644 --- a/modules/git/repo_tag_nogogit.go +++ b/modules/git/repo_tag_nogogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/repo_tree_gogit.go b/modules/git/repo_tree_gogit.go index cc156ea916c..eef09cddd6a 100644 --- a/modules/git/repo_tree_gogit.go +++ b/modules/git/repo_tree_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/repo_tree_nogogit.go b/modules/git/repo_tree_nogogit.go index 00009c997df..dc4a5becb9d 100644 --- a/modules/git/repo_tree_nogogit.go +++ b/modules/git/repo_tree_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/sha1_gogit.go b/modules/git/sha1_gogit.go index 30290f14b73..16501efb43f 100644 --- a/modules/git/sha1_gogit.go +++ b/modules/git/sha1_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/sha1_nogogit.go b/modules/git/sha1_nogogit.go index 53665fc9217..1835c68f5a1 100644 --- a/modules/git/sha1_nogogit.go +++ b/modules/git/sha1_nogogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/signature_gogit.go b/modules/git/signature_gogit.go index 903a48133f8..fe81cd97df3 100644 --- a/modules/git/signature_gogit.go +++ b/modules/git/signature_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/signature_nogogit.go b/modules/git/signature_nogogit.go index c6fe8e6d1a9..81da739a5b4 100644 --- a/modules/git/signature_nogogit.go +++ b/modules/git/signature_nogogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/tree_blob_gogit.go b/modules/git/tree_blob_gogit.go index be7cb33d353..bb010b58834 100644 --- a/modules/git/tree_blob_gogit.go +++ b/modules/git/tree_blob_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/tree_blob_nogogit.go b/modules/git/tree_blob_nogogit.go index df23ff01b47..3770004d6d7 100644 --- a/modules/git/tree_blob_nogogit.go +++ b/modules/git/tree_blob_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/tree_entry_gogit.go b/modules/git/tree_entry_gogit.go index 20e767eea1f..2b2992c32a5 100644 --- a/modules/git/tree_entry_gogit.go +++ b/modules/git/tree_entry_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go index 076062e1d67..aff67a3b22f 100644 --- a/modules/git/tree_entry_nogogit.go +++ b/modules/git/tree_entry_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/git/tree_entry_test.go b/modules/git/tree_entry_test.go index 9347e10b1b4..c512c7348e8 100644 --- a/modules/git/tree_entry_test.go +++ b/modules/git/tree_entry_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/tree_gogit.go b/modules/git/tree_gogit.go index bc020883660..54f8e140fbd 100644 --- a/modules/git/tree_gogit.go +++ b/modules/git/tree_gogit.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package git diff --git a/modules/git/tree_nogogit.go b/modules/git/tree_nogogit.go index f852c5a51e6..7defb064a47 100644 --- a/modules/git/tree_nogogit.go +++ b/modules/git/tree_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package git diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index b22b7b5860a..9d3816e9c2a 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !windows -// +build !windows package graceful diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go index 66baddfa38e..e7e619f53f6 100644 --- a/modules/graceful/manager_windows.go +++ b/modules/graceful/manager_windows.go @@ -4,7 +4,6 @@ // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler //go:build windows -// +build windows package graceful diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index 6ffa8150cc1..680ff529af8 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -4,7 +4,6 @@ // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler //go:build !windows -// +build !windows package graceful diff --git a/modules/graceful/net_windows.go b/modules/graceful/net_windows.go index 35b7a9d1fea..07ae51b8dd3 100644 --- a/modules/graceful/net_windows.go +++ b/modules/graceful/net_windows.go @@ -4,7 +4,6 @@ // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler //go:build windows -// +build windows package graceful diff --git a/modules/graceful/restart_unix.go b/modules/graceful/restart_unix.go index 9969e007c30..2654ddfb94d 100644 --- a/modules/graceful/restart_unix.go +++ b/modules/graceful/restart_unix.go @@ -4,7 +4,6 @@ // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler //go:build !windows -// +build !windows package graceful diff --git a/modules/lfs/pointer_scanner_gogit.go b/modules/lfs/pointer_scanner_gogit.go index b4ba6fc1335..ed27cb1f55b 100644 --- a/modules/lfs/pointer_scanner_gogit.go +++ b/modules/lfs/pointer_scanner_gogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gogit -// +build gogit package lfs diff --git a/modules/lfs/pointer_scanner_nogogit.go b/modules/lfs/pointer_scanner_nogogit.go index cdf88c51b00..d17f1f7b98e 100644 --- a/modules/lfs/pointer_scanner_nogogit.go +++ b/modules/lfs/pointer_scanner_nogogit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !gogit -// +build !gogit package lfs diff --git a/modules/migration/schemas_bindata.go b/modules/migration/schemas_bindata.go index d0fef698b42..febe0f75c0e 100644 --- a/modules/migration/schemas_bindata.go +++ b/modules/migration/schemas_bindata.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package migration diff --git a/modules/migration/schemas_dynamic.go b/modules/migration/schemas_dynamic.go index c883fafe987..1b767b2e725 100644 --- a/modules/migration/schemas_dynamic.go +++ b/modules/migration/schemas_dynamic.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !bindata -// +build !bindata package migration diff --git a/modules/migration/schemas_static.go b/modules/migration/schemas_static.go index 10c83b313a2..02957fc4edb 100644 --- a/modules/migration/schemas_static.go +++ b/modules/migration/schemas_static.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package migration diff --git a/modules/options/dynamic.go b/modules/options/dynamic.go index e1b9353c335..5fea337e420 100644 --- a/modules/options/dynamic.go +++ b/modules/options/dynamic.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !bindata -// +build !bindata package options diff --git a/modules/options/options_bindata.go b/modules/options/options_bindata.go index 921e15ab382..77b7a7ef419 100644 --- a/modules/options/options_bindata.go +++ b/modules/options/options_bindata.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package options diff --git a/modules/options/static.go b/modules/options/static.go index 5b61e58f8fc..6cad88cb61b 100644 --- a/modules/options/static.go +++ b/modules/options/static.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package options diff --git a/modules/public/public_bindata.go b/modules/public/public_bindata.go index 25c3c0d2a1a..fe250c64543 100644 --- a/modules/public/public_bindata.go +++ b/modules/public/public_bindata.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package public diff --git a/modules/public/serve_dynamic.go b/modules/public/serve_dynamic.go index 955c01e5103..672924a6365 100644 --- a/modules/public/serve_dynamic.go +++ b/modules/public/serve_dynamic.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !bindata -// +build !bindata package public diff --git a/modules/public/serve_static.go b/modules/public/serve_static.go index 8e82175e39c..9666880adfe 100644 --- a/modules/public/serve_static.go +++ b/modules/public/serve_static.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package public diff --git a/modules/setting/database_sqlite.go b/modules/setting/database_sqlite.go index 12c60cc86cc..1f18868d8ea 100644 --- a/modules/setting/database_sqlite.go +++ b/modules/setting/database_sqlite.go @@ -1,5 +1,4 @@ //go:build sqlite -// +build sqlite // Copyright 2014 The Gogs Authors. All rights reserved. // Use of this source code is governed by a MIT-style diff --git a/modules/svg/discover_bindata.go b/modules/svg/discover_bindata.go index e11951ff7ec..cca1de76a7d 100644 --- a/modules/svg/discover_bindata.go +++ b/modules/svg/discover_bindata.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package svg diff --git a/modules/svg/discover_nobindata.go b/modules/svg/discover_nobindata.go index e3f13ddf6c5..ef01fbcc3e8 100644 --- a/modules/svg/discover_nobindata.go +++ b/modules/svg/discover_nobindata.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !bindata -// +build !bindata package svg diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go index c6c47a6c880..de6968c314a 100644 --- a/modules/templates/dynamic.go +++ b/modules/templates/dynamic.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !bindata -// +build !bindata package templates diff --git a/modules/templates/static.go b/modules/templates/static.go index cb2978c2efc..351e48b4daa 100644 --- a/modules/templates/static.go +++ b/modules/templates/static.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package templates diff --git a/modules/templates/templates_bindata.go b/modules/templates/templates_bindata.go index 5b59e4447e5..bcb2cbaf3fe 100644 --- a/modules/templates/templates_bindata.go +++ b/modules/templates/templates_bindata.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build bindata -// +build bindata package templates diff --git a/routers/api/v1/auth.go b/routers/api/v1/auth.go index 359c9ec56bc..becf45f6433 100644 --- a/routers/api/v1/auth.go +++ b/routers/api/v1/auth.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !windows -// +build !windows package v1 diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go index 402bade5d41..43cbdec01c0 100644 --- a/routers/private/manager_unix.go +++ b/routers/private/manager_unix.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !windows -// +build !windows package private diff --git a/routers/private/manager_windows.go b/routers/private/manager_windows.go index 014018a5395..2b72ee952d4 100644 --- a/routers/private/manager_windows.go +++ b/routers/private/manager_windows.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package private diff --git a/routers/web/auth.go b/routers/web/auth.go index 4a7fb856be2..a771643b663 100644 --- a/routers/web/auth.go +++ b/routers/web/auth.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !windows -// +build !windows package web diff --git a/tools/fuzz.go b/tools/fuzz.go index 64fda17b5d8..8098868d5e2 100644 --- a/tools/fuzz.go +++ b/tools/fuzz.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gofuzz -// +build gofuzz package fuzz