Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade deps #30

Merged
merged 2 commits into from
Oct 1, 2023
Merged

chore: upgrade deps #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c00aa1
upgrade a few deps and fix the font issues
steverusso Oct 1, 2023
a63f58b
refactor: use this pkg for the few icons used in the browser
steverusso Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cmd/gio-icon-browser/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"image"
"image/color"

"gio.tools/icons"
"gioui.org/font"
"gioui.org/gesture"
"gioui.org/layout"
"gioui.org/op"
"gioui.org/op/clip"
"gioui.org/op/paint"
"gioui.org/text"
"gioui.org/widget"
"gioui.org/widget/material"
)
Expand Down Expand Up @@ -97,8 +98,8 @@ func (h *helpInfo) layout(gtx C, th *material.Theme) D {
height := 0
{
lbl := material.H5(th, "Keyboard Shortcuts")
lbl.Font.Weight = text.Bold
btn := material.IconButton(th, &h.closeBtn, &iconExitToApp, "")
lbl.Font.Weight = font.Bold
btn := material.IconButton(th, &h.closeBtn, icons.ActionExitToApp, "")
btn.Inset = layout.UniformInset(4)
dims := layout.Flex{Alignment: layout.Middle}.Layout(gtx,
layout.Flexed(1, lbl.Layout),
Expand Down Expand Up @@ -137,7 +138,7 @@ func layShortcutRow(gtx C, th *material.Theme, idx int) D {
return layout.Inset{Top: 3, Right: 8, Bottom: 3, Left: 8}.Layout(gtx, func(gtx C) D {
gtx.Constraints.Min.X = 0
lbl := material.Body2(th, allShortcuts[idx].keys[i])
lbl.Font.Variant = "Mono"
lbl.Font.Typeface = "monospace"
return lbl.Layout(gtx)
})
})
Expand Down
22 changes: 11 additions & 11 deletions cmd/gio-icon-browser/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ import (
"strings"
"time"

"gio.tools/fonts/vegur"
"gio.tools/icons"
"gioui.org/app"
"gioui.org/f32"
"gioui.org/font"
"gioui.org/gesture"
"gioui.org/io/clipboard"
"gioui.org/io/key"
Expand All @@ -26,9 +29,6 @@ import (
"gioui.org/unit"
"gioui.org/widget"
"gioui.org/widget/material"
"github.com/steverusso/gio-fonts/redhat/redhatmonoregular"
"github.com/steverusso/gio-fonts/vegur/vegurbold"
"github.com/steverusso/gio-fonts/vegur/vegurregular"
)

const copyNotifDuration = time.Second * 3
Expand Down Expand Up @@ -244,19 +244,19 @@ func (ib *iconBrowser) ensure(gtx C) {
func (ib *iconBrowser) layHeader(gtx C) D {
searchEd := material.Editor(ib.th, &ib.searchInput, "Search...")
numLbl := material.Body2(ib.th, strconv.Itoa(len(ib.matchedIndices)))
numLbl.Font.Weight = text.Bold
numLbl.Font.Weight = font.Bold
return layout.UniformInset(16).Layout(gtx, func(gtx C) D {
return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
layout.Rigid(func(gtx C) D {
return iconSearch.Layout(gtx, ib.th.Fg)
return icons.ActionSearch.Layout(gtx, ib.th.Fg)
}),
layout.Rigid(layout.Spacer{Width: 16}.Layout),
layout.Flexed(1, searchEd.Layout),
layout.Rigid(numLbl.Layout),
layout.Rigid(material.Caption(ib.th, " icons").Layout),
layout.Rigid(layout.Spacer{Width: 16}.Layout),
layout.Rigid(func(gtx C) D {
btn := material.IconButton(ib.th, &ib.openHelpBtn, &iconHelp, "")
btn := material.IconButton(ib.th, &ib.openHelpBtn, icons.ActionHelpOutline, "")
btn.Size = 28
btn.Inset = layout.UniformInset(2)
return btn.Layout(gtx)
Expand Down Expand Up @@ -314,6 +314,7 @@ func (ib *iconBrowser) layEntry(gtx C, index int) D {
ib.win.Invalidate()
}()
}

const inset = 10 // The outer inset that serves as space between entries.
const spacing = 15 // The space before and after each inner element of an entry.

Expand Down Expand Up @@ -341,6 +342,7 @@ func (ib *iconBrowser) layEntry(gtx C, index int) D {
offOp.Pop()
}
{
gtx.Constraints.Min.X = gtx.Constraints.Max.X
// Offset down (to after the icon) to draw the name label.
offOp := op.Offset(image.Pt(0, innerDims.Size.Y)).Push(gtx.Ops)
name := material.Body2(ib.th, en.name)
Expand All @@ -350,6 +352,7 @@ func (ib *iconBrowser) layEntry(gtx C, index int) D {
offOp.Pop()
}
drawEntry := m.Stop()

// We animate click presses by scaling the entry down and back up over a certain time
// frame.
const animTimeFrame = 200
Expand Down Expand Up @@ -431,11 +434,8 @@ func run() error {
app.Size(980, 770),
)

th := material.NewTheme([]text.FontFace{
{Font: text.Font{Typeface: "Vegur"}, Face: mustFace(vegurregular.OTF)},
{Font: text.Font{Typeface: "Vegur", Weight: text.Bold}, Face: mustFace(vegurbold.OTF)},
{Font: text.Font{Variant: "Mono"}, Face: mustFace(redhatmonoregular.TTF)},
})
th := material.NewTheme()
th.Shaper = text.NewShaper(text.WithCollection(vegur.Collection()))
th.TextSize = 18
th.Palette = material.Palette{
Bg: color.NRGBA{15, 15, 15, 255},
Expand Down
29 changes: 2 additions & 27 deletions cmd/gio-icon-browser/widgets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,20 @@ import (
"image/color"
"time"

"gioui.org/font/opentype"
"gioui.org/font"
"gioui.org/layout"
"gioui.org/op"
"gioui.org/op/clip"
"gioui.org/op/paint"
"gioui.org/text"
"gioui.org/widget"
"gioui.org/widget/material"
"golang.org/x/exp/shiny/materialdesign/icons"
)

type (
C = layout.Context
D = layout.Dimensions
)

var (
iconExitToApp = mustIcon(icons.ActionExitToApp)
iconHelp = mustIcon(icons.ActionHelpOutline)
iconSearch = mustIcon(icons.ActionSearch)
)

// mustIcon returns a new `widget.Icon` for the given byte slice or panics on error.
func mustIcon(data []byte) widget.Icon {
ic, err := widget.NewIcon(data)
if err != nil {
panic(err)
}
return *ic
}

func mustFace(data []byte) text.Face {
face, err := opentype.Parse(data)
if err != nil {
panic("failed to parse font: " + err.Error())
}
return face
}

type copyNotif struct {
msg string
at time.Time
Expand All @@ -53,7 +28,7 @@ func (n *copyNotif) layout(gtx C, th *material.Theme) D {
lbl := material.Body1(th, n.msg)
lbl.Alignment = text.Middle
lbl.Color = color.NRGBA{255, 255, 255, 255}
lbl.Font.Weight = text.SemiBold
lbl.Font.Weight = font.SemiBold
m := op.Record(gtx.Ops)
dims := layout.Inset{Top: 20, Right: 25, Bottom: 20, Left: 25}.Layout(gtx, func(gtx C) D {
return layout.Flex{}.Layout(gtx,
Expand Down
21 changes: 10 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ module gio.tools/icons
go 1.21.0

require (
gioui.org v0.0.0-20221210181309-a22e0f527aa4
gio.tools/fonts/vegur v0.0.0-20230924203849-00ad925e67d5
gioui.org v0.3.0
github.com/fatih/camelcase v1.0.0
github.com/steverusso/gio-fonts v0.0.0-20221207034752-d3d43d7eae48
golang.org/x/exp/shiny v0.0.0-20230321023759-10a507213a29
golang.org/x/tools v0.7.0
golang.org/x/exp/shiny v0.0.0-20230905200255-921286631fa9
golang.org/x/tools v0.13.0
)

require (
gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect
gioui.org/shader v1.0.6 // indirect
github.com/benoitkugler/textlayout v0.1.3 // indirect
github.com/gioui/uax v0.2.1-0.20220819135011-cda973fac06d // indirect
github.com/go-text/typesetting v0.0.0-20220411150340-35994bc27a7b // indirect
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.3.7 // indirect
github.com/go-text/typesetting v0.0.0-20230905121921-abdbcca6e0eb // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/image v0.12.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
)
82 changes: 51 additions & 31 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,63 @@
eliasnaur.com/font v0.0.0-20220124212145-832bb8fc08c3 h1:djFprmHZgrSepsHAIRMp5UJn3PzsoTg9drI+BDmif5Q=
gioui.org v0.0.0-20221210181309-a22e0f527aa4 h1:HT6aD7ucyJORViZgzeZo5qxwHn7TyKbNT5Aai1NPJ2Y=
gioui.org v0.0.0-20221210181309-a22e0f527aa4/go.mod h1:GN091SCcGAfHfQiSOetXx7Abdy+8nmONj0ZN63Xxf7w=
eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA=
gio.tools/fonts/vegur v0.0.0-20230924203849-00ad925e67d5 h1:u0TNY1+H1rIJ5vAczdwcV5OTZT3/r299b9PWv4Vd4Lw=
gio.tools/fonts/vegur v0.0.0-20230924203849-00ad925e67d5/go.mod h1:5FLPhx5noNlcAltA8qVB9pNNf1Tnb68JX6YrbZWxgYE=
gioui.org v0.3.0 h1:xZty/uLl1+/HNKpumX60JPQd46n8Zy6lc5T3IRMKoR4=
gioui.org v0.3.0/go.mod h1:1H72sKEk/fNFV+l0JNeM2Dt3co3Y4uaQcD+I+/GQ0e4=
gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJGFDjINIPi1jtO6pc=
gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
gioui.org/shader v1.0.6 h1:cvZmU+eODFR2545X+/8XucgZdTtEjR3QWW6W65b0q5Y=
gioui.org/shader v1.0.6/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
github.com/benoitkugler/pstokenizer v1.0.0/go.mod h1:l1G2Voirz0q/jj0TQfabNxVsa8HZXh/VMxFSRALWTiE=
github.com/benoitkugler/textlayout v0.0.5/go.mod h1:puH4v13Uz7uIhIH0XMk5jgc8U3MXcn5r3VlV9K8n0D8=
github.com/benoitkugler/textlayout v0.1.3 h1:Jv0E28xDkke3KrWle90yOLtBmZsUqXLBy70lZRfbKN0=
github.com/benoitkugler/textlayout v0.1.3/go.mod h1:o+1hFV+JSHBC9qNLIuwVoLedERU7sBPgEFcuSgfvi/w=
github.com/benoitkugler/textlayout-testdata v0.1.1 h1:AvFxBxpfrQd8v55qH59mZOJOQjtD6K2SFe9/HvnIbJk=
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
github.com/gioui/uax v0.2.1-0.20220819135011-cda973fac06d h1:ro1W5kY1pVBLHy4GokZUfr9cl7ewZhAiT5WsXqFDYE4=
github.com/gioui/uax v0.2.1-0.20220819135011-cda973fac06d/go.mod h1:b6uGh9ySJPVQG/RdiI88bE5sUGDk6vzzRujv1BAeuJc=
github.com/go-text/typesetting v0.0.0-20220411150340-35994bc27a7b h1:WINlj3ANt+CVrO2B4NGDHRlPvEWZPxjhb7z+JKypwXI=
github.com/go-text/typesetting v0.0.0-20220411150340-35994bc27a7b/go.mod h1:ZNYu5saGoMOqtkVH5T8onTwhzenDUVszI+5WFHJRaxQ=
github.com/steverusso/gio-fonts v0.0.0-20221207034752-d3d43d7eae48 h1:ykYdzm6qenf6q9PDzy756ogG2QovKTwGJrskCfjr+XI=
github.com/steverusso/gio-fonts v0.0.0-20221207034752-d3d43d7eae48/go.mod h1:hXPPLxKVyMb340G0pSyAHM9In2LK+IiKWU3oR/y3UUE=
golang.org/x/exp/shiny v0.0.0-20230321023759-10a507213a29 h1:uM92tP2dJQAC0zcyUIRXkokrkXj8fgt6GjCysDDaFh8=
golang.org/x/exp/shiny v0.0.0-20230321023759-10a507213a29/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0=
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 h1:/eM0PCrQI2xd471rI+snWuu251/+/jpBpZqir2mPdnU=
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
github.com/go-text/typesetting v0.0.0-20230905121921-abdbcca6e0eb h1:4GpJirtA8yY24aqbU3uppiXGYiVpWfLIrqc2NNKKk9s=
github.com/go-text/typesetting v0.0.0-20230905121921-abdbcca6e0eb/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
golang.org/x/exp/shiny v0.0.0-20230905200255-921286631fa9 h1:rvxT0xShhCtCvCCmF3wMK57nkbTYSaf/0Tp7TAllhMs=
golang.org/x/exp/shiny v0.0.0-20230905200255-921286631fa9/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0=
golang.org/x/image v0.12.0 h1:w13vZbU4o5rKOFFR8y7M+c4A5jXDC0uXTdHYRP8X2DQ=
golang.org/x/image v0.12.0/go.mod h1:Lu90jvHG7GfemOIcldsh9A2hS01ocl6oNO7ype5mEnk=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=