1374937 - Vendor encoding_c 0.7.6 into m-c

Status: RESOLVED FIXED

(Core :: Internationalization, enhancement)

Description

[Henri Sivonen (:hsivonen)]

Pick up changes that support bug 1374629.

Comment 1

[Henri Sivonen (:hsivonen)]

Attachment: Bug 1374937 - Vendor encoding_c 0.7.6 into m-c.

Review commit: https://reviewboard.mozilla.org/r/151242/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/151242/

Comment 2

[Masatoshi Kimura [:emk]]

Comment on attachment 8879840 [details]
Bug 1374937 - Vendor encoding_c 0.7.6 into m-c.

https://reviewboard.mozilla.org/r/151242/#review156196

::: third_party/rust/encoding_c/include/encoding_rs.h:130
(Diff revision 1)
>  ///
>  /// # Undefined behavior
>  ///
>  /// UB ensues if `name` and `name_len` don't designate a valid memory block
>  /// of if `name` is `NULL`.
> -ENCODING_RS_ENCODING const* encoding_for_name(uint8_t const* name, size_t name_len);
> +ENCODING_RS_NON_NULL_CONST_ENCODING_PTR encoding_for_name(uint8_t const* name, size_t name_len);

This caused a compiler error C2526:
10:54.81 f:\m\mozilla-unified\obj-x86_64-pc-mingw32\dist\include\encoding_rs.h(130): error C2526: 'encoding_for_name' : C linkage function cannot return C++ class 'mozilla::NotNull<const mozilla::Encoding *>'

So you can't make them NotNull, unfortunately. Please revert this part of change.

Comment 3

[Henri Sivonen (:hsivonen)]

Comment on attachment 8879840 [details]
Bug 1374937 - Vendor encoding_c 0.7.6 into m-c.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/151242/diff/1-2/

Comment 4

[Henri Sivonen (:hsivonen)]

I took the opportunity to change the macro to ENCODING_RS_NOT_NULL_CONST_ENCODING_PTR (NOT instead of NON) for consistency with the relevant C++ types saying "not" instead of "non".

Comment 5

[Masatoshi Kimura [:emk]]

Comment on attachment 8879840 [details]
Bug 1374937 - Vendor encoding_c 0.7.6 into m-c.

https://reviewboard.mozilla.org/r/151242/#review156302

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/81710b0b6ce3
Vendor encoding_c 0.7.6 into m-c. r=emk

Comment 7

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/81710b0b6ce3