Skip to content

Commit 98b5c83

Browse files
authored
Merge pull request #1631 from sdroege/trybuild-1.84-expected-output
glib: Fix expected compiler error text for Rust 1.84
2 parents 27f64cd + 2b5781e commit 98b5c83

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
66
| |
77
| required by a bound introduced by this call
88
|
9-
= help: within `imp::TestObject`, the trait `Sync` is not implemented for `RefCell<std::string::String>`, which is required by `TestObject: Send`
9+
= help: within `imp::TestObject`, the trait `Sync` is not implemented for `RefCell<std::string::String>`
1010
= note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead
1111
note: required because it appears within the type `imp::TestObject`
1212
--> tests/subclass_compiletest/02-no-auto-send-sync.rs:6:16

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ error[E0277]: `*mut c_void` cannot be sent between threads safely
66
| |
77
| required by a bound introduced by this call
88
|
9-
= help: the trait `Send` is not implemented for `*mut c_void`, which is required by `Object: Send`
9+
= help: the trait `Send` is not implemented for `*mut c_void`
1010
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
1111
note: required because it appears within the type `Object`
1212
--> src/object.rs
@@ -27,7 +27,7 @@ error[E0277]: `*mut c_void` cannot be shared between threads safely
2727
| |
2828
| required by a bound introduced by this call
2929
|
30-
= help: the trait `Sync` is not implemented for `*mut c_void`, which is required by `Object: Send`
30+
= help: the trait `Sync` is not implemented for `*mut c_void`
3131
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
3232
note: required because it appears within the type `Object`
3333
--> src/object.rs

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
@@ -6,7 +6,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
66
| |
77
| required by a bound introduced by this call
88
|
9-
= help: within `imp_parent::TestParent`, the trait `Sync` is not implemented for `RefCell<std::string::String>`, which is required by `TestObject: Send`
9+
= help: within `imp_parent::TestParent`, the trait `Sync` is not implemented for `RefCell<std::string::String>`
1010
= note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead
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

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
@@ -6,7 +6,7 @@ error[E0277]: `*mut c_void` cannot be sent between threads safely
66
| |
77
| required by a bound introduced by this call
88
|
9-
= help: the trait `Send` is not implemented for `*mut c_void`, which is required by `TestObject: Send`
9+
= help: the trait `Send` is not implemented for `*mut c_void`
1010
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
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
@@ -33,7 +33,7 @@ error[E0277]: `*mut c_void` cannot be shared between threads safely
3333
| |
3434
| required by a bound introduced by this call
3535
|
36-
= help: the trait `Sync` is not implemented for `*mut c_void`, which is required by `TestObject: Send`
36+
= help: the trait `Sync` is not implemented for `*mut c_void`
3737
= note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
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

0 commit comments

Comments
 (0)