Merge pull request #819 from jf2048/fix-1.66-lints

sdroege · web-flow · commit 6e08a3ae45fd · 2022-11-04T09:53:02.000+02:00
fix CI for 1.65/1.66
diff --git a/glib/src/translate.rs b/glib/src/translate.rs
@@ -2578,7 +2578,7 @@ mod tests {
             FileTest::EXISTS | FileTest::IS_DIR
         ));
         assert!(crate::file_test(
-            &dir_1.canonicalize().unwrap(),
+            dir_1.canonicalize().unwrap(),
             FileTest::EXISTS | FileTest::IS_DIR
         ));
 
@@ -2602,7 +2602,7 @@ mod tests {
             FileTest::EXISTS | FileTest::IS_DIR
         ));
         assert!(crate::file_test(
-            &dir_2.canonicalize().unwrap(),
+            dir_2.canonicalize().unwrap(),
             FileTest::EXISTS | FileTest::IS_DIR
         ));
     }
@@ -2663,6 +2663,7 @@ mod tests {
 
         impl TryFromGlib<libc::c_uint> for SpecialU32 {
             type Error = GlibNoneError;
+            #[allow(clippy::unnecessary_cast)]
             unsafe fn try_from_glib(val: libc::c_uint) -> Result<Self, GlibNoneError> {
                 if val == SpecialU32::GLIB_NONE {
                     return Err(GlibNoneError);
diff --git a/glib/tests/subclass_compiletest/02-no-auto-send-sync.stderr b/glib/tests/subclass_compiletest/02-no-auto-send-sync.stderr
@@ -12,7 +12,7 @@ note: required because it appears within the type `imp::TestObject`
    |
 6  |     pub struct TestObject {
    |                ^^^^^^^^^^
-   = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp::TestObject, ()>`
+   = note: required for `TypedObjectRef<imp::TestObject, ()>` to implement `Send`
 note: required because it appears within the type `TestObject`
   --> tests/subclass_compiletest/02-no-auto-send-sync.rs:20:16
    |
diff --git a/glib/tests/subclass_compiletest/03-object-no-auto-send-sync.stderr b/glib/tests/subclass_compiletest/03-object-no-auto-send-sync.stderr
@@ -7,7 +7,7 @@ error[E0277]: `*mut c_void` cannot be sent between threads safely
   |     required by a bound introduced by this call
   |
   = help: the trait `Send` is not implemented for `*mut c_void`
-  = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<*mut c_void, ()>`
+  = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
   = note: required because it appears within the type `Object`
 note: required by a bound in `main::check`
  --> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
@@ -24,7 +24,7 @@ error[E0277]: `*mut c_void` cannot be shared between threads safely
   |     required by a bound introduced by this call
   |
   = help: the trait `Sync` is not implemented for `*mut c_void`
-  = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<*mut c_void, ()>`
+  = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
   = note: required because it appears within the type `Object`
 note: required by a bound in `main::check`
  --> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
diff --git a/glib/tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.stderr b/glib/tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.stderr
@@ -12,13 +12,13 @@ note: required because it appears within the type `imp_parent::TestParent`
    |
 6  |     pub struct TestParent {
    |                ^^^^^^^^^^
-   = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_parent::TestParent, ()>`
+   = note: required for `TypedObjectRef<imp_parent::TestParent, ()>` to implement `Send`
 note: required because it appears within the type `TestParent`
   --> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:20:16
    |
 20 |     pub struct TestParent(ObjectSubclass<imp_parent::TestParent>);
    |                ^^^^^^^^^^
-   = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_object::TestObject, TestParent>`
+   = note: required for `TypedObjectRef<imp_object::TestObject, TestParent>` to implement `Send`
 note: required because it appears within the type `TestObject`
   --> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:53:16
    |
diff --git a/glib/tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.stderr b/glib/tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.stderr
@@ -7,13 +7,13 @@ error[E0277]: `*mut c_void` cannot be sent between threads safely
    |     required by a bound introduced by this call
    |
    = help: the trait `Send` is not implemented for `*mut c_void`
-   = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<*mut c_void, ()>`
+   = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
 note: required because it appears within the type `InitiallyUnowned`
   --> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:3:16
    |
 3  |     pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);
    |                ^^^^^^^^^^^^^^^^
-   = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>`
+   = note: required for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>` to implement `Send`
 note: required because it appears within the type `TestObject`
   --> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:37:16
    |
@@ -34,13 +34,13 @@ error[E0277]: `*mut c_void` cannot be shared between threads safely
    |     required by a bound introduced by this call
    |
    = help: the trait `Sync` is not implemented for `*mut c_void`
-   = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<*mut c_void, ()>`
+   = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
 note: required because it appears within the type `InitiallyUnowned`
   --> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:3:16
    |
 3  |     pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);
    |                ^^^^^^^^^^^^^^^^
-   = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>`
+   = note: required for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>` to implement `Send`
 note: required because it appears within the type `TestObject`
   --> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:37:16
    |

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ note: required because it appears within the type `imp::TestObject`
`12`	`12`	`\|`
`13`	`13`	`6 \| pub struct TestObject {`
`14`	`14`	`\| ^^^^^^^^^^`
`15`		- = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp::TestObject, ()>`
	`15`	+ = note: required for `TypedObjectRef<imp::TestObject, ()>` to implement `Send`
`16`	`16`	note: required because it appears within the type `TestObject`
`17`	`17`	`--> tests/subclass_compiletest/02-no-auto-send-sync.rs:20:16`
`18`	`18`	`\|`
Original file line number	Diff line number	Diff line change
@@ -12,13 +12,13 @@ note: required because it appears within the type `imp_parent::TestParent`
`12`	`12`	`\|`
`13`	`13`	`6 \| pub struct TestParent {`
`14`	`14`	`\| ^^^^^^^^^^`
`15`		- = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_parent::TestParent, ()>`
	`15`	+ = note: required for `TypedObjectRef<imp_parent::TestParent, ()>` to implement `Send`
`16`	`16`	note: required because it appears within the type `TestParent`
`17`	`17`	`--> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:20:16`
`18`	`18`	`\|`
`19`	`19`	`20 \| pub struct TestParent(ObjectSubclass<imp_parent::TestParent>);`
`20`	`20`	`\| ^^^^^^^^^^`
`21`		- = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_object::TestObject, TestParent>`
	`21`	+ = note: required for `TypedObjectRef<imp_object::TestObject, TestParent>` to implement `Send`
`22`	`22`	note: required because it appears within the type `TestObject`
`23`	`23`	`--> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:53:16`
`24`	`24`	`\|`
Original file line number	Diff line number	Diff line change
@@ -7,13 +7,13 @@ error[E0277]: `*mut c_void` cannot be sent between threads safely
`7`	`7`	`\| required by a bound introduced by this call`
`8`	`8`	`\|`
`9`	`9`	= help: the trait `Send` is not implemented for `*mut c_void`
`10`		- = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<*mut c_void, ()>`
	`10`	+ = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
`11`	`11`	note: required because it appears within the type `InitiallyUnowned`
`12`	`12`	`--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:3:16`
`13`	`13`	`\|`
`14`	`14`	`3 \| pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);`
`15`	`15`	`\| ^^^^^^^^^^^^^^^^`
`16`		- = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>`
	`16`	+ = note: required for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>` to implement `Send`
`17`	`17`	note: required because it appears within the type `TestObject`
`18`	`18`	`--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:37:16`
`19`	`19`	`\|`
@@ -34,13 +34,13 @@ error[E0277]: `*mut c_void` cannot be shared between threads safely
`34`	`34`	`\| required by a bound introduced by this call`
`35`	`35`	`\|`
`36`	`36`	= help: the trait `Sync` is not implemented for `*mut c_void`
`37`		- = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<*mut c_void, ()>`
	`37`	+ = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
`38`	`38`	note: required because it appears within the type `InitiallyUnowned`
`39`	`39`	`--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:3:16`
`40`	`40`	`\|`
`41`	`41`	`3 \| pub struct InitiallyUnowned(Object<glib::gobject_ffi::GInitiallyUnowned, glib::gobject_ffi::GInitiallyUnownedClass>);`
`42`	`42`	`\| ^^^^^^^^^^^^^^^^`
`43`		- = note: required because of the requirements on the impl of `Send` for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>`
	`43`	+ = note: required for `TypedObjectRef<imp_object::TestObject, InitiallyUnowned>` to implement `Send`
`44`	`44`	note: required because it appears within the type `TestObject`
`45`	`45`	`--> tests/subclass_compiletest/06-no-auto-send-sync-with-non-send-sync-ffi-parent.rs:37:16`
`46`	`46`	`\|`