Skip to content

Commit 9903467

Browse files
authored
Merge pull request #1050 from jf2048/derived-hash-lint
Fix CI for rust 1.68
2 parents bb27866 + a3affea commit 9903467

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
77
| required by a bound introduced by this call
88
|
99
= help: within `imp::TestObject`, the trait `Sync` is not implemented for `RefCell<std::string::String>`
10-
note: required because it appears within the type `imp::TestObject`
10+
note: required because it appears within the type `TestObject`
1111
--> tests/subclass_compiletest/02-no-auto-send-sync.rs:6:16
1212
|
1313
6 | pub struct TestObject {
@@ -22,4 +22,4 @@ note: required by a bound in `main::check`
2222
--> tests/subclass_compiletest/02-no-auto-send-sync.rs:30:17
2323
|
2424
30 | fn check<T: Send>(_obj: &T) {}
25-
| ^^^^ required by this bound in `main::check`
25+
| ^^^^ required by this bound in `check`

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
@@ -13,7 +13,7 @@ note: required by a bound in `main::check`
1313
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
1414
|
1515
2 | fn check<T: Send + Sync>(_obj: &T) {}
16-
| ^^^^ required by this bound in `main::check`
16+
| ^^^^ required by this bound in `check`
1717

1818
error[E0277]: `*mut c_void` cannot be shared between threads safely
1919
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:5:11
@@ -30,4 +30,4 @@ note: required by a bound in `main::check`
3030
--> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
3131
|
3232
2 | fn check<T: Send + Sync>(_obj: &T) {}
33-
| ^^^^ required by this bound in `main::check`
33+
| ^^^^ required by this bound in `check`

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
77
| required by a bound introduced by this call
88
|
99
= help: within `imp_parent::TestParent`, the trait `Sync` is not implemented for `RefCell<std::string::String>`
10-
note: required because it appears within the type `imp_parent::TestParent`
10+
note: required because it appears within the type `TestParent`
1111
--> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:6:16
1212
|
1313
6 | pub struct TestParent {
@@ -28,4 +28,4 @@ note: required by a bound in `main::check`
2828
--> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:63:17
2929
|
3030
63 | fn check<T: Send + Sync>(_obj: &T) {}
31-
| ^^^^ required by this bound in `main::check`
31+
| ^^^^ required by this bound in `check`

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
@@ -23,7 +23,7 @@ note: required by a bound in `main::check`
2323
--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:47:17
2424
|
2525
47 | fn check<T: Send + Sync>(_obj: &T) {}
26-
| ^^^^ required by this bound in `main::check`
26+
| ^^^^ required by this bound in `check`
2727

2828
error[E0277]: `*mut c_void` cannot be shared between threads safely
2929
--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:50:11
@@ -50,4 +50,4 @@ note: required by a bound in `main::check`
5050
--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:47:17
5151
|
5252
47 | fn check<T: Send + Sync>(_obj: &T) {}
53-
| ^^^^ required by this bound in `main::check`
53+
| ^^^^ required by this bound in `check`

pango/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub use ffi;
77
pub use glib;
88

99
#[allow(clippy::too_many_arguments)]
10-
#[allow(clippy::derive_hash_xor_eq)]
10+
#[allow(clippy::derived_hash_with_manual_eq)]
1111
#[allow(clippy::missing_safety_doc)]
1212
mod auto;
1313
pub use crate::{

0 commit comments

Comments
 (0)