@@ -339,25 +339,6 @@ func parsePath(flag, arg string) (path string) {
339
339
return path
340
340
}
341
341
342
- // parsePath parses -flag=arg expecting arg to be path to a tool (allows ./)
343
- func parseToolPath (flag , arg string ) (path string ) {
344
- if strings .Contains (arg , "@" ) {
345
- base .Fatalf ("go: -%s=%s: need just path, not path@version" , flag , arg )
346
- }
347
- if arg == "." {
348
- return arg
349
- }
350
- toCheck := arg
351
- if strings .HasPrefix (arg , "./" ) {
352
- toCheck = arg [2 :]
353
- }
354
- if err := module .CheckImportPath (toCheck ); err != nil {
355
- base .Fatalf ("go: -%s=%s: invalid path: %v" , flag , arg , err )
356
- }
357
-
358
- return arg
359
- }
360
-
361
342
// parsePathVersionOptional parses path[@version], using adj to
362
343
// describe any errors.
363
344
func parsePathVersionOptional (adj , arg string , allowDirPath bool ) (path , version string , err error ) {
@@ -547,7 +528,7 @@ func flagDropRetract(arg string) {
547
528
548
529
// flagTool implements the -tool flag.
549
530
func flagTool (arg string ) {
550
- path := parseToolPath ("tool" , arg )
531
+ path := parsePath ("tool" , arg )
551
532
edits = append (edits , func (f * modfile.File ) {
552
533
if err := f .AddTool (path ); err != nil {
553
534
base .Fatalf ("go: -tool=%s: %v" , arg , err )
@@ -557,7 +538,7 @@ func flagTool(arg string) {
557
538
558
539
// flagDropTool implements the -droptool flag.
559
540
func flagDropTool (arg string ) {
560
- path := parseToolPath ("droptool" , arg )
541
+ path := parsePath ("droptool" , arg )
561
542
edits = append (edits , func (f * modfile.File ) {
562
543
if err := f .DropTool (path ); err != nil {
563
544
base .Fatalf ("go: -droptool=%s: %v" , arg , err )
0 commit comments