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

Jump to bottom

cmd/font2lua: remove golang.org/x/exp usage #18

Merged
merged 3 commits into from
Apr 22, 2024
Merged

cmd/font2lua: remove golang.org/x/exp usage #18

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8cb0f4
cmd/font2lua: remove golang.org/x/exp usage
jsleeio Apr 21, 2024
5767c91
Update cmd/font2lua/main.go
jsleeio Apr 22, 2024
a22f3b5
Merge branch 'master' into zap-x-maps
gmlewis Apr 22, 2024
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
6 changes: 4 additions & 2 deletions cmd/font2lua/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"unicode/utf8"

"github.com/gmlewis/go-fonts/webfont"
"golang.org/x/exp/maps"
)

var (
Expand Down Expand Up @@ -283,7 +282,10 @@ func writeFont(fontData *webfont.FontData) {
log.Fatalf("webfont: %v", err)
}

keys := maps.Keys(p.glyphs)
keys := make([]string, 0, len(p.glyphs))
for k := range p.glyphs {
keys = append(keys, k)
}
sort.Strings(keys)

var lines []string
Expand Down
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ require (
github.com/gmlewis/go3d v0.0.4
github.com/gmlewis/ponoko2d v0.0.0-20190404133045-d77d370bec9a
github.com/yofu/dxf v0.0.0-20190710012328-5a6d1e83f16c
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
google.golang.org/protobuf v1.33.0
)

Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ github.com/yofu/dxf v0.0.0-20190710012328-5a6d1e83f16c/go.mod h1:gnT4GQzgKW8+TLI
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-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
golang.org/x/image v0.10.0 h1:gXjUUtwtx5yOE0VKWq1CH4IJAClq4UGgUA3i+rpON9M=
golang.org/x/image v0.10.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
Expand Down