Skip to content

Commit ded8f2d

Browse files
sdroegesdroege
committed
glib: Update expected compiler error texts in compiletests for rustc 1.90
1 parent dd35a12 commit ded8f2d

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎glib/tests/regex_compiletest/05-variance.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error: lifetime may not live long enough
2-
--> tests/regex_compiletest/05-variance.rs:10:5
3-
|
4-
9 | fn contravariance_check<'short>(input: MatchInfo<'short>) -> MatchInfo<'static> {
2+
--> tests/regex_compiletest/05-variance.rs:10:5
3+
|
4+
9 | fn contravariance_check<'short>(input: MatchInfo<'short>) -> MatchInfo<'static> {
55
| ------ lifetime `'short` defined here
66
10 | input
77
| ^^^^^ returning this value requires that `'short` must outlive `'static`

‎glib/tests/subclass_compiletest/02-no-auto-send-sync.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
1111
note: required because it appears within the type `imp::TestObject`
1212
--> tests/subclass_compiletest/02-no-auto-send-sync.rs:6:16
1313
|
14-
6 | pub struct TestObject {
14+
6 | pub struct TestObject {
1515
| ^^^^^^^^^^
1616
= note: required for `TypedObjectRef<imp::TestObject, ()>` to implement `Send`
1717
note: required because it appears within the type `TestObject`

‎glib/tests/subclass_compiletest/03-object-no-auto-send-sync.stderr‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
error[E0277]: `*mut c_void` cannot be sent between threads safely
22
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:5:11
33
|
4-
5 | check(&obj);
5-
| ----- ^^^^ `*mut c_void` cannot be sent between threads safely
6-
| |
7-
| required by a bound introduced by this call
8-
|
9-
= help: the trait `Send` is not implemented for `*mut c_void`
10-
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
4+
5 | check(&obj);
5+
| ----- ^^^^ `*mut c_void` cannot be sent between threads safely
6+
| |
7+
| required by a bound introduced by this call
8+
|
9+
= help: the trait `Send` is not implemented for `*mut c_void`
10+
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
1111
note: required because it appears within the type `Object`
12-
--> src/object.rs
13-
|
14-
| pub Object, *mut std::os::raw::c_void, (), gobject_ffi::GObject, @ffi_class gobject_ffi::GObjectClass, @type_ gobject_ffi::g_object_g...
15-
| ^^^^^^
12+
--> src/object.rs
13+
|
14+
| pub Object, *mut std::os::raw::c_void, (), gobject_ffi::GObject, @ffi_class gobject_ffi::GObjectClass, @type_ gobject_ffi::g_object_g...
15+
| ^^^^^^
1616
note: required by a bound in `main::check`
17-
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
18-
|
19-
2 | fn check<T: Send + Sync>(_obj: &T) {}
20-
| ^^^^ required by this bound in `check`
17+
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
18+
|
19+
2 | fn check<T: Send + Sync>(_obj: &T) {}
20+
| ^^^^ required by this bound in `check`
2121

2222
error[E0277]: `*mut c_void` cannot be shared between threads safely
2323
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:5:11
2424
|
25-
5 | check(&obj);
26-
| ----- ^^^^ `*mut c_void` cannot be shared between threads safely
27-
| |
28-
| required by a bound introduced by this call
29-
|
30-
= help: the trait `Sync` is not implemented for `*mut c_void`
31-
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
25+
5 | check(&obj);
26+
| ----- ^^^^ `*mut c_void` cannot be shared between threads safely
27+
| |
28+
| required by a bound introduced by this call
29+
|
30+
= help: the trait `Sync` is not implemented for `*mut c_void`
31+
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
3232
note: required because it appears within the type `Object`
33-
--> src/object.rs
34-
|
35-
| pub Object, *mut std::os::raw::c_void, (), gobject_ffi::GObject, @ffi_class gobject_ffi::GObjectClass, @type_ gobject_ffi::g_object_g...
36-
| ^^^^^^
33+
--> src/object.rs
34+
|
35+
| pub Object, *mut std::os::raw::c_void, (), gobject_ffi::GObject, @ffi_class gobject_ffi::GObjectClass, @type_ gobject_ffi::g_object_g...
36+
| ^^^^^^
3737
note: required by a bound in `main::check`
38-
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
39-
|
40-
2 | fn check<T: Send + Sync>(_obj: &T) {}
41-
| ^^^^ required by this bound in `check`
38+
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
39+
|
40+
2 | fn check<T: Send + Sync>(_obj: &T) {}
41+
| ^^^^ required by this bound in `check`

‎glib/tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
1111
note: required because it appears within the type `imp_parent::TestParent`
1212
--> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:6:16
1313
|
14-
6 | pub struct TestParent {
14+
6 | pub struct TestParent {
1515
| ^^^^^^^^^^
1616
= note: required for `TypedObjectRef<imp_parent::TestParent, ()>` to implement `Send`
1717
note: required because it appears within the type `TestParent`

‎glib/tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error[E0277]: `*mut c_void` cannot be sent between threads safely
1111
note: required because it appears within the type `InitiallyUnowned`
1212
--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:3:16
1313
|
14-
3 | pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);
14+
3 | pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);
1515
| ^^^^^^^^^^^^^^^^
1616
= note: required for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>` to implement `Send`
1717
note: required because it appears within the type `TestObject`
@@ -38,7 +38,7 @@ error[E0277]: `*mut c_void` cannot be shared between threads safely
3838
note: required because it appears within the type `InitiallyUnowned`
3939
--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:3:16
4040
|
41-
3 | pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);
41+
3 | pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);
4242
| ^^^^^^^^^^^^^^^^
4343
= note: required for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>` to implement `Send`
4444
note: required because it appears within the type `TestObject`

0 commit comments

Comments
 (0)