Skip to content

Commit 193a1ae

Browse files
committed
Update ui test suite to nightly-2026-01-21
1 parent b64be89 commit 193a1ae

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

tests/ui/derive_noncopy.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
error[E0204]: the trait `std::marker::Copy` cannot be implemented for this type
1+
error[E0204]: the trait `Copy` cannot be implemented for this type
22
--> tests/ui/derive_noncopy.rs:4:12
33
|
44
4 | struct TryCopy {
55
| ^^^^^^^
66
5 | other: Other,
7-
| ------------ this field does not implement `std::marker::Copy`
7+
| ------------ this field does not implement `Copy`
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
error[E0004]: non-exhaustive patterns: `ffi::A { repr: 2_u8..=u8::MAX }` not covered
1+
error[E0004]: non-exhaustive patterns: `A { repr: 2_u8..=u8::MAX }` not covered
22
--> tests/ui/enum_match_without_wildcard.rs:12:11
33
|
44
12 | match a {
5-
| ^ pattern `ffi::A { repr: 2_u8..=u8::MAX }` not covered
5+
| ^ pattern `A { repr: 2_u8..=u8::MAX }` not covered
66
|
7-
note: `ffi::A` defined here
7+
note: `A` defined here
88
--> tests/ui/enum_match_without_wildcard.rs:3:10
99
|
1010
3 | enum A {
1111
| ^
12-
= note: the matched value is of type `ffi::A`
12+
= note: the matched value is of type `A`
1313
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
1414
|
1515
14 ~ ffi::A::FieldB => 2021,
16-
15 ~ ffi::A { repr: 2_u8..=u8::MAX } => todo!(),
16+
15 ~ A { repr: 2_u8..=u8::MAX } => todo!(),
1717
|

tests/ui/rust_pinned.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ note: required because it appears within the type `Pinned`
1111
|
1212
10 | pub struct Pinned {
1313
| ^^^^^^
14-
note: required by a bound in `require_unpin`
14+
note: required by a bound in `cxx::private::require_unpin`
1515
--> src/rust_type.rs
1616
|
1717
| pub fn require_unpin<T: ?Sized + Unpin>() {}

tests/ui/slice_of_type_alias.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0271]: type mismatch resolving `<&[ElementOpaque] as SliceOfExternType>::
44
16 | fn g(slice: &[ElementOpaque]);
55
| ^^^^^^^^^^^^^^^^ expected `Trivial`, found `Opaque`
66
|
7-
note: required by a bound in `Without::check_slice`
7+
note: required by a bound in `cxx::private::Without::check_slice`
88
--> src/rust_type.rs
99
|
1010
| pub const fn check_slice<U: SliceOfExternType<Kind = Trivial>>(&self) {}

tests/ui/vec_opaque.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ error: needs a cxx::ExternType impl in order to be used as a vector element in V
1010
11 | type Job;
1111
| ^^^^^^^^
1212

13-
error[E0277]: the trait bound `handle::Job: ImplVec` is not satisfied
13+
error[E0277]: the trait bound `handle::Job: cxx::private::ImplVec` is not satisfied
1414
--> tests/ui/vec_opaque.rs:22:14
1515
|
1616
22 | type Job = crate::handle::Job;
1717
| ^^^ unsatisfied trait bound
1818
|
19-
help: the trait `ImplVec` is not implemented for `handle::Job`
19+
help: the trait `cxx::private::ImplVec` is not implemented for `handle::Job`
2020
--> tests/ui/vec_opaque.rs:4:9
2121
|
2222
4 | type Job;
2323
| ^^^^^^^^
24-
note: required by a bound in `require_vec`
24+
note: required by a bound in `cxx::private::require_vec`
2525
--> src/rust_type.rs
2626
|
2727
| pub fn require_vec<T: ImplVec>() {}

tests/ui/wrong_type_id.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ error[E0271]: type mismatch resolving `<StringPiece as ExternType>::Id == (f, o,
44
11 | type ByteRange = crate::here::StringPiece;
55
| ^^^^^^^^^ type mismatch resolving `<StringPiece as ExternType>::Id == (f, o, l, l, y, (), B, y, t, e, R, a, n, g, e)`
66
|
7-
note: expected this to be `(f, o, l, l, y, (), B, y, t, e, R, a, n, g, e)`
7+
note: expected this to be `(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)`
88
--> tests/ui/wrong_type_id.rs:1:1
99
|
1010
1 | #[cxx::bridge(namespace = "folly")]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
12-
= note: expected tuple `(f, o, l, l, y, (), B, y, t, e, R, a, n, g, e)`
13-
found tuple `(f, o, l, l, y, (), S, t, r, i, n, g, P, i, e, c, e)`
14-
note: required by a bound in `verify_extern_type`
12+
= 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)`
13+
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)`
14+
note: required by a bound in `cxx::private::verify_extern_type`
1515
--> src/extern_type.rs
1616
|
1717
| pub fn verify_extern_type<T: ExternType<Id = Id>, Id>() {}

0 commit comments

Comments
 (0)