From 95efed774edffc44f69168ba44c8e459dac70808 Mon Sep 17 00:00:00 2001
From: Boston Cartwright <bostonc@gmail.com>
Date: Sat, 26 Mar 2022 01:55:01 +0000
Subject: [PATCH] cmd/go: undo import order changes in modinfo init

---
 src/cmd/go/internal/modload/init.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go
index f494876f95..565d04b998 100644
--- a/src/cmd/go/internal/modload/init.go
+++ b/src/cmd/go/internal/modload/init.go
@@ -6,18 +6,12 @@ package modload
 
 import (
 	"bytes"
-	"cmd/go/internal/base"
-	"cmd/go/internal/cfg"
-	"cmd/go/internal/fsys"
-	"cmd/go/internal/lockedfile"
-	"cmd/go/internal/modconv"
-	"cmd/go/internal/modfetch"
-	"cmd/go/internal/search"
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"go/build"
+	"internal/lazyregexp"
 	"io/ioutil"
 	"os"
 	"path"
@@ -26,7 +20,13 @@ import (
 	"strings"
 	"sync"
 
-	"internal/lazyregexp"
+	"cmd/go/internal/base"
+	"cmd/go/internal/cfg"
+	"cmd/go/internal/fsys"
+	"cmd/go/internal/lockedfile"
+	"cmd/go/internal/modconv"
+	"cmd/go/internal/modfetch"
+	"cmd/go/internal/search"
 
 	"golang.org/x/mod/modfile"
 	"golang.org/x/mod/module"
@@ -1424,7 +1424,9 @@ Run 'go help mod init' for more information.
 	return "", fmt.Errorf(msg, dir, reason)
 }
 
-var importCommentRE = lazyregexp.New(`(?m)^package[ \t]+[^ \t\r\n/]+[ \t]+//[ \t]+import[ \t]+(\"[^"]+\")[ \t]*\r?\n`)
+var (
+	importCommentRE = lazyregexp.New(`(?m)^package[ \t]+[^ \t\r\n/]+[ \t]+//[ \t]+import[ \t]+(\"[^"]+\")[ \t]*\r?\n`)
+)
 
 func findImportComment(file string) string {
 	data, err := os.ReadFile(file)