Merge pull request #731 from alexcrichton/rename-usv-str

Tweak some WebIDL type names in methods
This commit is contained in:
Alex Crichton 2018-08-20 10:32:15 -07:00 committed by GitHub
commit 3b02b8e319
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions

View File

@ -84,11 +84,11 @@ fn optional_and_union_arguments() {
assert_eq!(f.m("abc"), "string, abc, boolean, true, number, 123, number, 456"); assert_eq!(f.m("abc"), "string, abc, boolean, true, number, 123, number, 456");
assert_eq!(f.m_with_b("abc", false), "string, abc, boolean, false, number, 123, number, 456"); assert_eq!(f.m_with_b("abc", false), "string, abc, boolean, false, number, 123, number, 456");
assert_eq!(f.m_with_bool_and_i16("abc", false, 5), "string, abc, boolean, false, number, 5, number, 456"); assert_eq!(f.m_with_bool_and_i16("abc", false, 5), "string, abc, boolean, false, number, 5, number, 456");
assert_eq!(f.m_with_bool_and_dom_str("abc", false, "5"), "string, abc, boolean, false, string, 5, number, 456"); assert_eq!(f.m_with_bool_and_str("abc", false, "5"), "string, abc, boolean, false, string, 5, number, 456");
assert_eq!(f.m_with_bool_and_i16_and_opt_i64("abc", false, 5, Some(10)), "string, abc, boolean, false, number, 5, bigint, 10"); assert_eq!(f.m_with_bool_and_i16_and_opt_i64("abc", false, 5, Some(10)), "string, abc, boolean, false, number, 5, bigint, 10");
assert_eq!(f.m_with_bool_and_i16_and_opt_bool("abc", false, 5, Some(true)), "string, abc, boolean, false, number, 5, boolean, true"); assert_eq!(f.m_with_bool_and_i16_and_opt_bool("abc", false, 5, Some(true)), "string, abc, boolean, false, number, 5, boolean, true");
assert_eq!(f.m_with_bool_and_dom_str_and_opt_i64("abc", false, "5", Some(10)), "string, abc, boolean, false, string, 5, bigint, 10"); assert_eq!(f.m_with_bool_and_str_and_opt_i64("abc", false, "5", Some(10)), "string, abc, boolean, false, string, 5, bigint, 10");
assert_eq!(f.m_with_bool_and_dom_str_and_opt_bool("abc", false, "5", Some(true)), "string, abc, boolean, false, string, 5, boolean, true"); assert_eq!(f.m_with_bool_and_str_and_opt_bool("abc", false, "5", Some(true)), "string, abc, boolean, false, string, 5, boolean, true");
} }
#[wasm_bindgen_test] #[wasm_bindgen_test]

View File

@ -348,13 +348,13 @@ impl<'a> IdlType<'a> {
IdlType::UnsignedLong => dst.push_str("u32"), IdlType::UnsignedLong => dst.push_str("u32"),
IdlType::LongLong => dst.push_str("i64"), IdlType::LongLong => dst.push_str("i64"),
IdlType::UnsignedLongLong => dst.push_str("u64"), IdlType::UnsignedLongLong => dst.push_str("u64"),
IdlType::Float => dst.push_str("f32"), IdlType::Float |
IdlType::UnrestrictedFloat => dst.push_str("unrestricted_f32"), IdlType::UnrestrictedFloat => dst.push_str("f32"),
IdlType::Double => dst.push_str("f64"), IdlType::Double |
IdlType::UnrestrictedDouble => dst.push_str("unrestricted_f64"), IdlType::UnrestrictedDouble => dst.push_str("f64"),
IdlType::DomString => dst.push_str("dom_str"), IdlType::DomString |
IdlType::ByteString => dst.push_str("byte_str"), IdlType::ByteString |
IdlType::UsvString => dst.push_str("usv_str"), IdlType::UsvString => dst.push_str("str"),
IdlType::Object => dst.push_str("object"), IdlType::Object => dst.push_str("object"),
IdlType::Symbol => dst.push_str("symbol"), IdlType::Symbol => dst.push_str("symbol"),
IdlType::Error => dst.push_str("error"), IdlType::Error => dst.push_str("error"),