3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00

Merge pull request #570 from slingamn/confusables_lastlook

remove m -> rn mapping
This commit is contained in:
Daniel Oaks 2019-06-25 02:15:55 +10:00 committed by GitHub
commit 609e1aeb94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

4
Gopkg.lock generated
View File

@ -62,11 +62,11 @@
revision = "9520e82c474b0a04dd04f8a40959027271bab992" revision = "9520e82c474b0a04dd04f8a40959027271bab992"
[[projects]] [[projects]]
digest = "1:7caf3ea977a13cd8b9a2e1ecef1ccaa8e38f831b4f6ffcb8bd0aa909c48afb3a" digest = "1:e7de6e4830c9d4fe1463c09a2ee15ec3eb9455c2ea916044675c413e8a9c6608"
name = "github.com/oragono/confusables" name = "github.com/oragono/confusables"
packages = ["."] packages = ["."]
pruneopts = "UT" pruneopts = "UT"
revision = "d5dd03409482fae2457f0742be22782890f720c2" revision = "fe1cf31a24b01cac37194669863df51713e08e54"
[[projects]] [[projects]]
branch = "master" branch = "master"

View File

@ -50,7 +50,7 @@
name = "github.com/oragono/go-ident" name = "github.com/oragono/go-ident"
[[constraint]] [[constraint]]
revision = "d5dd03409482fae2457f0742be22782890f720c2" revision = "fe1cf31a24b01cac37194669863df51713e08e54"
name = "github.com/oragono/confusables" name = "github.com/oragono/confusables"
[[constraint]] [[constraint]]

View File

@ -148,7 +148,7 @@ func Skeleton(name string) (string, error) {
// same as PRECIS: // same as PRECIS:
name = width.Fold.String(name) name = width.Fold.String(name)
name = confusables.Skeleton(name) name = confusables.SkeletonTweaked(name)
// internationalized lowercasing for skeletons; this is much more lenient than // internationalized lowercasing for skeletons; this is much more lenient than
// Casefold. In particular, skeletons are expected to mix scripts (which may // Casefold. In particular, skeletons are expected to mix scripts (which may

View File

@ -153,8 +153,8 @@ func TestSkeleton(t *testing.T) {
return skel return skel
} }
if skeleton("warning") != skeleton("waming") { if skeleton("warning") == skeleton("waming") {
t.Errorf("i give up, Oragono should consider rn confusable with m") t.Errorf("Oragono shouldn't consider rn confusable with m")
} }
if skeleton("Phi|ip") != "philip" { if skeleton("Phi|ip") != "philip" {
@ -165,7 +165,7 @@ func TestSkeleton(t *testing.T) {
t.Errorf("fullwidth characters should skeletonize to plain old ascii characters") t.Errorf("fullwidth characters should skeletonize to plain old ascii characters")
} }
if skeleton("") != "smt" { if skeleton("") != skeleton("smt") {
t.Errorf("after skeletonizing, we should casefold") t.Errorf("after skeletonizing, we should casefold")
} }

2
vendor

@ -1 +1 @@
Subproject commit 8ddbb531841add50f8b7aff8fe00bef311448aaa Subproject commit 6fb1b63d24a6ccc28a8aecbd47a7eb18a2ace2c9