Skip to content

Commit efd8dfd

Browse files
cristianbrindusancristianbrindusan
committed
Backed out 9 changesets (bug 1701695) for causing xpcshell failures in test_messagecontext.js. CLOSED TREE
Backed out changeset e88dd41c0a90 (bug 1701695) Backed out changeset 823ed70ef5fe (bug 1701695) Backed out changeset 11f97bc74622 (bug 1701695) Backed out changeset fdf12ac55593 (bug 1701695) Backed out changeset abcf774d3b58 (bug 1701695) Backed out changeset 4239fe67d69f (bug 1701695) Backed out changeset 216472b634b9 (bug 1701695) Backed out changeset 89ff5f91d8e9 (bug 1701695) Backed out changeset 9c0dbc73dad2 (bug 1701695)
1 parent a080791 commit efd8dfd

22 files changed

+689
-1083
lines changed

‎config/check_spidermonkey_style.py

+1-8
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,7 @@ def check_style(enable_fixup):
273273
# - "js/public/Vector.h" -> "js/Vector.h"
274274
# - "js/src/vm/String.h" -> "vm/String.h"
275275

276-
non_js_dirnames = (
277-
"mfbt/",
278-
"memory/mozalloc/",
279-
"mozglue/",
280-
"intl/components/",
281-
) # type: tuple(str)
276+
non_js_dirnames = ("mfbt/", "memory/mozalloc/", "mozglue/") # type: tuple(str)
282277
non_js_inclnames = set() # type: set(inclname)
283278
js_names = dict() # type: dict(filename, inclname)
284279

@@ -309,8 +304,6 @@ def check_style(enable_fixup):
309304
for filename in filenames:
310305
if filename.endswith(".h"):
311306
inclname = "mozilla/" + filename
312-
if non_js_dir == "intl/components/":
313-
inclname = "mozilla/intl/" + filename
314307
non_js_inclnames.add(inclname)
315308

316309
# Look for header files in js/public.

‎config/check_vanilla_allocations.py

-4
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ def main():
160160
if filename == "Decimal.o":
161161
continue
162162

163-
# Ignore allocations from the m-c intl/components implementations.
164-
if "intl_components" in filename:
165-
continue
166-
167163
fn = m.group(2)
168164
if filename == "Utility.o":
169165
util_Utility_cpp.add(fn)

‎intl/components/gtest/TestNumberFormat.cpp

+29-56
Original file line numberDiff line numberDiff line change
@@ -30,54 +30,49 @@ class Buffer {
3030

3131
TEST(IntlNumberFormat, Basic)
3232
{
33-
NumberFormatOptions options;
34-
UniquePtr<NumberFormat> nf =
35-
NumberFormat::TryCreate("en-US", options).unwrap();
33+
NumberFormat nf("en-US");
3634
Buffer<uint8_t> buf8;
37-
ASSERT_TRUE(nf->format(1234.56, buf8).isOk());
35+
ASSERT_TRUE(nf.format(1234.56, buf8));
3836
ASSERT_EQ(
3937
std::string_view(static_cast<const char*>(buf8.data()), buf8.mWritten),
4038
"1,234.56");
4139
Buffer<char16_t> buf16;
42-
ASSERT_TRUE(nf->format(1234.56, buf16).isOk());
40+
ASSERT_TRUE(nf.format(1234.56, buf16));
4341
ASSERT_EQ(std::u16string_view(static_cast<const char16_t*>(buf16.data()),
4442
buf16.mWritten),
4543
u"1,234.56");
46-
const char16_t* res16 = nf->format(1234.56).unwrap().data();
44+
const char16_t* res16 = nf.format(1234.56);
4745
ASSERT_TRUE(res16 != nullptr);
4846
ASSERT_EQ(std::u16string_view(res16), u"1,234.56");
4947

50-
UniquePtr<NumberFormat> nfAr =
51-
NumberFormat::TryCreate("ar", options).unwrap();
52-
ASSERT_TRUE(nfAr->format(1234.56, buf8).isOk());
48+
NumberFormat nfAr("ar");
49+
ASSERT_TRUE(nfAr.format(1234.56, buf8));
5350
ASSERT_EQ(
5451
std::string_view(static_cast<const char*>(buf8.data()), buf8.mWritten),
5552
"١٬٢٣٤٫٥٦");
56-
ASSERT_TRUE(nfAr->format(1234.56, buf16).isOk());
53+
ASSERT_TRUE(nfAr.format(1234.56, buf16));
5754
ASSERT_EQ(std::u16string_view(static_cast<const char16_t*>(buf16.data()),
5855
buf16.mWritten),
5956
u"١٬٢٣٤٫٥٦");
60-
res16 = nfAr->format(1234.56).unwrap().data();
57+
res16 = nfAr.format(1234.56);
6158
ASSERT_TRUE(res16 != nullptr);
6259
ASSERT_EQ(std::u16string_view(res16), u"١٬٢٣٤٫٥٦");
6360
}
6461

6562
TEST(IntlNumberFormat, Numbers)
6663
{
67-
NumberFormatOptions options;
68-
UniquePtr<NumberFormat> nf =
69-
NumberFormat::TryCreate("es-ES", options).unwrap();
64+
NumberFormat nf("es-ES");
7065
Buffer<uint8_t> buf8;
71-
ASSERT_TRUE(nf->format(123456.789, buf8).isOk());
66+
ASSERT_TRUE(nf.format(123456.789, buf8));
7267
ASSERT_EQ(
7368
std::string_view(static_cast<const char*>(buf8.data()), buf8.mWritten),
7469
"123.456,789");
7570
Buffer<char16_t> buf16;
76-
ASSERT_TRUE(nf->format(123456.789, buf16).isOk());
71+
ASSERT_TRUE(nf.format(123456.789, buf16));
7772
ASSERT_EQ(std::u16string_view(static_cast<const char16_t*>(buf16.data()),
7873
buf16.mWritten),
7974
u"123.456,789");
80-
const char16_t* res = nf->format(123456.789).unwrap().data();
75+
const char16_t* res = nf.format(123456.789);
8176
ASSERT_TRUE(res != nullptr);
8277
ASSERT_EQ(std::u16string_view(res), u"123.456,789");
8378
}
@@ -86,14 +81,13 @@ TEST(IntlNumberFormat, SignificantDigits)
8681
{
8782
NumberFormatOptions options;
8883
options.mSignificantDigits = Some(std::make_pair(3, 5));
89-
UniquePtr<NumberFormat> nf =
90-
NumberFormat::TryCreate("es-ES", options).unwrap();
84+
NumberFormat nf("es-ES", options);
9185
Buffer<uint8_t> buf8;
92-
ASSERT_TRUE(nf->format(123456.789, buf8).isOk());
86+
ASSERT_TRUE(nf.format(123456.789, buf8));
9387
ASSERT_EQ(
9488
std::string_view(static_cast<const char*>(buf8.data()), buf8.mWritten),
9589
"123.460");
96-
ASSERT_TRUE(nf->format(0.7, buf8).isOk());
90+
ASSERT_TRUE(nf.format(0.7, buf8));
9791
ASSERT_EQ(
9892
std::string_view(static_cast<const char*>(buf8.data()), buf8.mWritten),
9993
"0,700");
@@ -102,21 +96,20 @@ TEST(IntlNumberFormat, SignificantDigits)
10296
TEST(IntlNumberFormat, Currency)
10397
{
10498
NumberFormatOptions options;
105-
options.mCurrency =
106-
Some(std::make_pair("MXN", NumberFormatOptions::CurrencyDisplay::Symbol));
107-
UniquePtr<NumberFormat> nf =
108-
NumberFormat::TryCreate("es-MX", options).unwrap();
99+
options.mCurrency = Some(
100+
std::make_pair("MXN", NumberFormatOptions::CurrencyDisplayStyle::Symbol));
101+
NumberFormat nf("es-MX", options);
109102
Buffer<uint8_t> buf8;
110-
ASSERT_TRUE(nf->format(123456.789, buf8).isOk());
103+
ASSERT_TRUE(nf.format(123456.789, buf8));
111104
ASSERT_EQ(
112105
std::string_view(static_cast<const char*>(buf8.data()), buf8.mWritten),
113106
"$123,456.79");
114107
Buffer<char16_t> buf16;
115-
ASSERT_TRUE(nf->format(123456.789, buf16).isOk());
108+
ASSERT_TRUE(nf.format(123456.789, buf16));
116109
ASSERT_EQ(std::u16string_view(static_cast<const char16_t*>(buf16.data()),
117110
buf16.mWritten),
118111
u"$123,456.79");
119-
const char16_t* res = nf->format(123456.789).unwrap().data();
112+
const char16_t* res = nf.format(123456.789);
120113
ASSERT_TRUE(res != nullptr);
121114
ASSERT_EQ(std::u16string_view(res), u"$123,456.79");
122115
}
@@ -126,19 +119,18 @@ TEST(IntlNumberFormat, Unit)
126119
NumberFormatOptions options;
127120
options.mUnit = Some(std::make_pair("meter-per-second",
128121
NumberFormatOptions::UnitDisplay::Long));
129-
UniquePtr<NumberFormat> nf =
130-
NumberFormat::TryCreate("es-MX", options).unwrap();
122+
NumberFormat nf("es-MX", options);
131123
Buffer<uint8_t> buf8;
132-
ASSERT_TRUE(nf->format(12.34, buf8).isOk());
124+
ASSERT_TRUE(nf.format(12.34, buf8));
133125
ASSERT_EQ(
134126
std::string_view(static_cast<const char*>(buf8.data()), buf8.mWritten),
135127
"12.34 metros por segundo");
136128
Buffer<char16_t> buf16;
137-
ASSERT_TRUE(nf->format(12.34, buf16).isOk());
129+
ASSERT_TRUE(nf.format(12.34, buf16));
138130
ASSERT_EQ(std::u16string_view(static_cast<const char16_t*>(buf16.data()),
139131
buf16.mWritten),
140132
u"12.34 metros por segundo");
141-
const char16_t* res = nf->format(12.34).unwrap().data();
133+
const char16_t* res = nf.format(12.34);
142134
ASSERT_TRUE(res != nullptr);
143135
ASSERT_EQ(std::u16string_view(res), u"12.34 metros por segundo");
144136

@@ -147,37 +139,18 @@ TEST(IntlNumberFormat, Unit)
147139
const char* unit = "meter-per-second-with-some-trailing-garbage";
148140
options.mUnit = Some(std::make_pair(std::string_view(unit, 5),
149141
NumberFormatOptions::UnitDisplay::Long));
150-
UniquePtr<NumberFormat> nf2 =
151-
NumberFormat::TryCreate("es-MX", options).unwrap();
152-
res = nf2->format(12.34).unwrap().data();
142+
NumberFormat nf2("es-MX", options);
143+
res = nf2.format(12.34);
153144
ASSERT_TRUE(res != nullptr);
154145
ASSERT_EQ(std::u16string_view(res), u"12.34 metros");
155146

156147
options.mUnit = Some(std::make_pair(std::string_view(unit, 16),
157148
NumberFormatOptions::UnitDisplay::Long));
158-
UniquePtr<NumberFormat> nf3 =
159-
NumberFormat::TryCreate("es-MX", options).unwrap();
160-
res = nf3->format(12.34).unwrap().data();
149+
NumberFormat nf3("es-MX", options);
150+
res = nf3.format(12.34);
161151
ASSERT_TRUE(res != nullptr);
162152
ASSERT_EQ(std::u16string_view(res), u"12.34 metros por segundo");
163153
}
164154

165-
TEST(IntlNumberFormat, FormatToParts)
166-
{
167-
NumberFormatOptions options;
168-
UniquePtr<NumberFormat> nf =
169-
NumberFormat::TryCreate("es-ES", options).unwrap();
170-
NumberPartVector parts;
171-
const char16_t* res = nf->formatToParts(123456.789, parts).unwrap().data();
172-
ASSERT_TRUE(res != nullptr);
173-
ASSERT_EQ(std::u16string_view(res), u"123.456,789");
174-
ASSERT_EQ(parts.length(), 5U);
175-
ASSERT_EQ(parts[0], (NumberPart{NumberPartType::Integer, 3}));
176-
ASSERT_EQ(parts[1], (NumberPart{NumberPartType::Group, 4}));
177-
ASSERT_EQ(parts[2], (NumberPart{NumberPartType::Integer, 7}));
178-
ASSERT_EQ(parts[3], (NumberPart{NumberPartType::Decimal, 8}));
179-
ASSERT_EQ(parts[4], (NumberPart{NumberPartType::Fraction, 11}));
180-
}
181-
182155
} // namespace intl
183156
} // namespace mozilla

‎intl/components/moz.build

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
# This Source Code Form is subject to the terms of the Mozilla Public
44
# License, v. 2.0. If a copy of the MPL was not distributed with this
55
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
67
EXPORTS.mozilla.intl = [
78
"src/NumberFormat.h",
8-
# Bug 1704509: Remove NumberFormatterSkeleton.h from public API once we have
9-
# an unified PluralRules implementation.
10-
"src/NumberFormatterSkeleton.h",
119
]
1210

1311
UNIFIED_SOURCES += [
1412
"src/NumberFormat.cpp",
15-
"src/NumberFormatFields.cpp",
1613
"src/NumberFormatterSkeleton.cpp",
1714
]
1815

19-
if not CONFIG["JS_STANDALONE"]:
20-
TEST_DIRS += ["gtest"]
16+
TEST_DIRS += ["gtest"]
2117

2218
Library("intlcomponents")

0 commit comments

Comments
 (0)