Merge pull request #233 from dtolnay/ui

Unbreak ui tests

Author: dtolnay

tests/ffi/lib.rs

@@ -64,7 +64,10 @@ pub mod ffi {
         fn c_take_rust_vec_shared_forward_iterator(v: Vec<Shared>);
         fn c_take_ref_rust_vec(v: &Vec<u8>);
         fn c_take_ref_rust_vec_copy(v: &Vec<u8>);
+        /*
+        // https://github.com/dtolnay/cxx/issues/232
         fn c_take_callback(callback: fn(String) -> usize);
+        */
         fn c_take_enum(e: Enum);
 
         fn c_try_return_void() -> Result<()>;

tests/ffi/tests.cc

@@ -249,9 +249,12 @@ void c_take_ref_rust_vec_copy(const rust::Vec<uint8_t> &v) {
   }
 }
 
+/*
+// https://github.com/dtolnay/cxx/issues/232
 void c_take_callback(rust::Fn<size_t(rust::String)> callback) {
   callback("2020");
 }
+*/
 
 void c_take_enum(Enum e) {
   if (e == Enum::AVal) {

tests/ffi/tests.h

@@ -69,7 +69,10 @@ void c_take_rust_vec_shared(rust::Vec<Shared> v);
 void c_take_rust_vec_shared_forward_iterator(rust::Vec<Shared> v);
 void c_take_ref_rust_vec(const rust::Vec<uint8_t> &v);
 void c_take_ref_rust_vec_copy(const rust::Vec<uint8_t> &v);
+/*
+// https://github.com/dtolnay/cxx/issues/232
 void c_take_callback(rust::Fn<size_t(rust::String)> callback);
+*/
 void c_take_enum(Enum e);
 
 void c_try_return_void();

tests/test.rs

@@ -121,6 +121,8 @@ fn test_c_take() {
     check!(ffi::c_take_enum(ffi::Enum::AVal));
 }
 
+/*
+// https://github.com/dtolnay/cxx/issues/232
 #[test]
 fn test_c_callback() {
     fn callback(s: String) -> usize {
@@ -132,6 +134,7 @@ fn test_c_callback() {
 
     check!(ffi::c_take_callback(callback));
 }
+*/
 
 #[test]
 fn test_c_call_r() {

tests/ui/enum_match_without_wildcard.stderr

@@ -1,11 +1,11 @@
-error[E0004]: non-exhaustive patterns: `A { repr: 2u8..=u8::MAX }` not covered
+error[E0004]: non-exhaustive patterns: `A { repr: 2_u8..=u8::MAX }` not covered
   --> $DIR/enum_match_without_wildcard.rs:12:11
    |
 1  | #[cxx::bridge]
    | -------------- `ffi::A` defined here
 ...
 12 |     match a {
-   |           ^ pattern `A { repr: 2u8..=u8::MAX }` not covered
+   |           ^ pattern `A { repr: 2_u8..=u8::MAX }` not covered
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
    = note: the matched value is of type `ffi::A`

tests/ui/opaque_not_sized.stderr

@@ -5,5 +5,4 @@ error[E0277]: the size for values of type `str` cannot be known at compilation t
     |              ^^^^^ doesn't have a size known at compile-time
     |
     = help: within `TypeR`, the trait `std::marker::Sized` is not implemented for `str`
-    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
     = note: required because it appears within the type `TypeR`

tests/ui/wrong_type_id.stderr

@@ -1,4 +1,4 @@
-error[E0271]: type mismatch resolving `<here::StringPiece as cxx::extern_type::ExternType>::Id == (cxx::f, cxx::o, cxx::l, cxx::l, cxx::y, (), cxx::B, cxx::y, cxx::t, cxx::e, cxx::R, cxx::a, cxx::n, cxx::g, cxx::e)`
+error[E0271]: type mismatch resolving `<here::StringPiece as cxx::ExternType>::Id == (cxx::f, cxx::o, cxx::l, cxx::l, cxx::y, (), cxx::B, cxx::y, cxx::t, cxx::e, cxx::R, cxx::a, cxx::n, cxx::g, cxx::e)`
    --> $DIR/wrong_type_id.rs:11:9
     |
 11  |         type ByteRange = crate::here::StringPiece;
@@ -7,7 +7,7 @@ error[E0271]: type mismatch resolving `<here::StringPiece as cxx::extern_type::E
    ::: $WORKSPACE/src/extern_type.rs:110:41
     |
 110 | pub fn verify_extern_type<T: ExternType<Id = Id>, Id>() {}
-    |                                         ------- required by this bound in `cxx::extern_type::verify_extern_type`
+    |                                         ------- required by this bound in `cxx::private::verify_extern_type`
     |
     = note: expected tuple `(cxx::f, cxx::o, cxx::l, cxx::l, cxx::y, (), cxx::B, cxx::y, cxx::t, cxx::e, cxx::R, cxx::a, cxx::n, cxx::g, cxx::e)`
                found tuple `(cxx::f, cxx::o, cxx::l, cxx::l, cxx::y, (), cxx::S, cxx::t, cxx::r, cxx::i, cxx::n, cxx::g, cxx::P, cxx::i, cxx::e, cxx::c, cxx::e)`