Skip to content

Commit

Permalink
chore: add new labels
Browse files Browse the repository at this point in the history 
Ref whatwg/encoding#211
  • Loading branch information
@lucacasonato @hsivonen
lucacasonato authored and hsivonen committed Jun 17, 2021
1 parent e98a209 commit 97acf71
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 3 deletions.
27 changes: 24 additions & 3 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2137,7 +2137,7 @@ pub static X_USER_DEFINED_INIT: Encoding = Encoding {
/// `static`.
pub static X_USER_DEFINED: &'static Encoding = &X_USER_DEFINED_INIT;

static LABELS_SORTED: [&'static str; 219] = [
static LABELS_SORTED: [&'static str; 228] = [
"l1",
"l2",
"l3",
Expand All @@ -2153,6 +2153,7 @@ static LABELS_SORTED: [&'static str; 219] = [
"utf8",
"koi8",
"sjis",
"ucs-2",
"ms932",
"cp866",
"utf-8",
Expand Down Expand Up @@ -2197,6 +2198,7 @@ static LABELS_SORTED: [&'static str; 219] = [
"gb_2312",
"dos-874",
"cn-big5",
"unicode",
"chinese",
"logical",
"cskoi8r",
Expand Down Expand Up @@ -2249,6 +2251,7 @@ static LABELS_SORTED: [&'static str; 219] = [
"iso8859-8",
"iso-ir-58",
"iso8859-9",
"csunicode",
"macintosh",
"shift-jis",
"shift_jis",
Expand Down Expand Up @@ -2308,6 +2311,8 @@ static LABELS_SORTED: [&'static str; 219] = [
"csisolatin9",
"csiso88596e",
"csiso88598e",
"unicodefffe",
"unicodefeff",
"csmacintosh",
"csiso88596i",
"csiso88598i",
Expand All @@ -2334,12 +2339,15 @@ static LABELS_SORTED: [&'static str; 219] = [
"iso-8859-8-i",
"sun_eu_greek",
"csksc56011987",
"unicode20utf8",
"unicode11utf8",
"ks_c_5601-1987",
"ansi_x3.4-1968",
"ks_c_5601-1989",
"x-mac-cyrillic",
"x-user-defined",
"csiso58gb231280",
"iso-10646-ucs-2",
"iso_8859-1:1987",
"iso_8859-2:1987",
"iso_8859-6:1987",
Expand All @@ -2348,6 +2356,7 @@ static LABELS_SORTED: [&'static str; 219] = [
"iso_8859-4:1988",
"iso_8859-5:1988",
"iso_8859-8:1988",
"x-unicode20utf8",
"iso_8859-9:1989",
"csisolatingreek",
"x-mac-ukrainian",
Expand All @@ -2359,7 +2368,7 @@ static LABELS_SORTED: [&'static str; 219] = [
"cseucpkdfmtjapanese",
];

static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 219] = [
static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 228] = [
&WINDOWS_1252_INIT,
&ISO_8859_2_INIT,
&ISO_8859_3_INIT,
Expand All @@ -2375,6 +2384,7 @@ static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 219] = [
&UTF_8_INIT,
&KOI8_R_INIT,
&SHIFT_JIS_INIT,
&UTF_16LE_INIT,
&SHIFT_JIS_INIT,
&IBM866_INIT,
&UTF_8_INIT,
Expand Down Expand Up @@ -2419,6 +2429,7 @@ static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 219] = [
&GBK_INIT,
&WINDOWS_874_INIT,
&BIG5_INIT,
&UTF_16LE_INIT,
&GBK_INIT,
&ISO_8859_8_I_INIT,
&KOI8_R_INIT,
Expand Down Expand Up @@ -2471,6 +2482,7 @@ static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 219] = [
&ISO_8859_8_INIT,
&GBK_INIT,
&WINDOWS_1254_INIT,
&UTF_16LE_INIT,
&MACINTOSH_INIT,
&SHIFT_JIS_INIT,
&SHIFT_JIS_INIT,
Expand Down Expand Up @@ -2530,6 +2542,8 @@ static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 219] = [
&ISO_8859_15_INIT,
&ISO_8859_6_INIT,
&ISO_8859_8_INIT,
&UTF_16BE_INIT,
&UTF_16LE_INIT,
&MACINTOSH_INIT,
&ISO_8859_6_INIT,
&ISO_8859_8_I_INIT,
Expand All @@ -2556,12 +2570,15 @@ static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 219] = [
&ISO_8859_8_I_INIT,
&ISO_8859_7_INIT,
&EUC_KR_INIT,
&UTF_8_INIT,
&UTF_8_INIT,
&EUC_KR_INIT,
&WINDOWS_1252_INIT,
&EUC_KR_INIT,
&X_MAC_CYRILLIC_INIT,
&X_USER_DEFINED_INIT,
&GBK_INIT,
&UTF_16LE_INIT,
&WINDOWS_1252_INIT,
&ISO_8859_2_INIT,
&ISO_8859_6_INIT,
Expand All @@ -2570,6 +2587,7 @@ static ENCODINGS_IN_LABEL_SORT: [&'static Encoding; 219] = [
&ISO_8859_4_INIT,
&ISO_8859_5_INIT,
&ISO_8859_8_INIT,
&UTF_8_INIT,
&WINDOWS_1254_INIT,
&ISO_8859_7_INIT,
&X_MAC_CYRILLIC_INIT,
Expand Down Expand Up @@ -3420,7 +3438,10 @@ impl<'de> Visitor<'de> for EncodingVisitor {
if let Some(enc) = Encoding::for_label(value.as_bytes()) {
Ok(enc)
} else {
Err(E::custom(alloc::format!("invalid encoding label: {}", value)))
Err(E::custom(alloc::format!(
"invalid encoding label: {}",
value
)))
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions src/test_labels_names.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ fn test_all_labels() {
assert_eq!(Encoding::for_label(b"utf8"), Some(UTF_8));
assert_eq!(Encoding::for_label(b"koi8"), Some(KOI8_R));
assert_eq!(Encoding::for_label(b"sjis"), Some(SHIFT_JIS));
assert_eq!(Encoding::for_label(b"ucs-2"), Some(UTF_16LE));
assert_eq!(Encoding::for_label(b"ms932"), Some(SHIFT_JIS));
assert_eq!(Encoding::for_label(b"cp866"), Some(IBM866));
assert_eq!(Encoding::for_label(b"utf-8"), Some(UTF_8));
Expand Down Expand Up @@ -67,6 +68,7 @@ fn test_all_labels() {
assert_eq!(Encoding::for_label(b"gb_2312"), Some(GBK));
assert_eq!(Encoding::for_label(b"dos-874"), Some(WINDOWS_874));
assert_eq!(Encoding::for_label(b"cn-big5"), Some(BIG5));
assert_eq!(Encoding::for_label(b"unicode"), Some(UTF_16LE));
assert_eq!(Encoding::for_label(b"chinese"), Some(GBK));
assert_eq!(Encoding::for_label(b"logical"), Some(ISO_8859_8_I));
assert_eq!(Encoding::for_label(b"cskoi8r"), Some(KOI8_R));
Expand Down Expand Up @@ -119,6 +121,7 @@ fn test_all_labels() {
assert_eq!(Encoding::for_label(b"iso8859-8"), Some(ISO_8859_8));
assert_eq!(Encoding::for_label(b"iso-ir-58"), Some(GBK));
assert_eq!(Encoding::for_label(b"iso8859-9"), Some(WINDOWS_1254));
assert_eq!(Encoding::for_label(b"csunicode"), Some(UTF_16LE));
assert_eq!(Encoding::for_label(b"macintosh"), Some(MACINTOSH));
assert_eq!(Encoding::for_label(b"shift-jis"), Some(SHIFT_JIS));
assert_eq!(Encoding::for_label(b"shift_jis"), Some(SHIFT_JIS));
Expand Down Expand Up @@ -178,6 +181,8 @@ fn test_all_labels() {
assert_eq!(Encoding::for_label(b"csisolatin9"), Some(ISO_8859_15));
assert_eq!(Encoding::for_label(b"csiso88596e"), Some(ISO_8859_6));
assert_eq!(Encoding::for_label(b"csiso88598e"), Some(ISO_8859_8));
assert_eq!(Encoding::for_label(b"unicodefffe"), Some(UTF_16BE));
assert_eq!(Encoding::for_label(b"unicodefeff"), Some(UTF_16LE));
assert_eq!(Encoding::for_label(b"csmacintosh"), Some(MACINTOSH));
assert_eq!(Encoding::for_label(b"csiso88596i"), Some(ISO_8859_6));
assert_eq!(Encoding::for_label(b"csiso88598i"), Some(ISO_8859_8_I));
Expand All @@ -204,12 +209,15 @@ fn test_all_labels() {
assert_eq!(Encoding::for_label(b"iso-8859-8-i"), Some(ISO_8859_8_I));
assert_eq!(Encoding::for_label(b"sun_eu_greek"), Some(ISO_8859_7));
assert_eq!(Encoding::for_label(b"csksc56011987"), Some(EUC_KR));
assert_eq!(Encoding::for_label(b"unicode20utf8"), Some(UTF_8));
assert_eq!(Encoding::for_label(b"unicode11utf8"), Some(UTF_8));
assert_eq!(Encoding::for_label(b"ks_c_5601-1987"), Some(EUC_KR));
assert_eq!(Encoding::for_label(b"ansi_x3.4-1968"), Some(WINDOWS_1252));
assert_eq!(Encoding::for_label(b"ks_c_5601-1989"), Some(EUC_KR));
assert_eq!(Encoding::for_label(b"x-mac-cyrillic"), Some(X_MAC_CYRILLIC));
assert_eq!(Encoding::for_label(b"x-user-defined"), Some(X_USER_DEFINED));
assert_eq!(Encoding::for_label(b"csiso58gb231280"), Some(GBK));
assert_eq!(Encoding::for_label(b"iso-10646-ucs-2"), Some(UTF_16LE));
assert_eq!(Encoding::for_label(b"iso_8859-1:1987"), Some(WINDOWS_1252));
assert_eq!(Encoding::for_label(b"iso_8859-2:1987"), Some(ISO_8859_2));
assert_eq!(Encoding::for_label(b"iso_8859-6:1987"), Some(ISO_8859_6));
Expand All @@ -218,6 +226,7 @@ fn test_all_labels() {
assert_eq!(Encoding::for_label(b"iso_8859-4:1988"), Some(ISO_8859_4));
assert_eq!(Encoding::for_label(b"iso_8859-5:1988"), Some(ISO_8859_5));
assert_eq!(Encoding::for_label(b"iso_8859-8:1988"), Some(ISO_8859_8));
assert_eq!(Encoding::for_label(b"x-unicode20utf8"), Some(UTF_8));
assert_eq!(Encoding::for_label(b"iso_8859-9:1989"), Some(WINDOWS_1254));
assert_eq!(Encoding::for_label(b"csisolatingreek"), Some(ISO_8859_7));
assert_eq!(
Expand Down

0 comments on commit 97acf71

Please sign in to comment.