From 003ac2cd5e87642e5073334bb83223df637764a0 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Fri, 1 Mar 2024 14:21:10 -0800
Subject: [PATCH] Address nightly clippy lints

---
 wayland-backend/src/client_api.rs          | 3 +++
 wayland-backend/src/rs/client_impl/mod.rs  | 4 +---
 wayland-backend/src/rs/wire.rs             | 1 -
 wayland-backend/src/server_api.rs          | 3 +++
 wayland-backend/src/sys/client_impl/mod.rs | 2 --
 wayland-server/src/socket.rs               | 1 +
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/wayland-backend/src/client_api.rs b/wayland-backend/src/client_api.rs
index a8633657e5c..fc2961688c1 100644
--- a/wayland-backend/src/client_api.rs
+++ b/wayland-backend/src/client_api.rs
@@ -1,3 +1,6 @@
+// Suppress lint in `impl_downcast!`
+#![allow(clippy::multiple_bound_locations)]
+
 use std::{
     any::Any,
     fmt,
diff --git a/wayland-backend/src/rs/client_impl/mod.rs b/wayland-backend/src/rs/client_impl/mod.rs
index 8001fa3e623..2e1f841a373 100644
--- a/wayland-backend/src/rs/client_impl/mod.rs
+++ b/wayland-backend/src/rs/client_impl/mod.rs
@@ -28,8 +28,6 @@ use super::{
     wire::MessageParseError,
 };
 
-pub use crate::types::client::{InvalidId, NoWaylandLib, WaylandError};
-
 #[derive(Debug, Clone)]
 struct Data {
     client_destroyed: bool,
@@ -407,7 +405,7 @@ impl InnerBackend {
         // Prepare the message in a debug-compatible way
         let args = args.into_iter().map(|arg| {
             if let Argument::NewId(ObjectId { id: p }) = arg {
-                if !p.id == 0 {
+                if p.id != 0 {
                     panic!("The newid provided when sending request {}@{}.{} is not a placeholder.", object.interface.name, id.id, message_desc.name);
                 }
                 if let Some((child_id, child_serial, child_interface)) = child {
diff --git a/wayland-backend/src/rs/wire.rs b/wayland-backend/src/rs/wire.rs
index 239e20466ee..76dddd7b265 100644
--- a/wayland-backend/src/rs/wire.rs
+++ b/wayland-backend/src/rs/wire.rs
@@ -1,7 +1,6 @@
 //! Types and routines used to manipulate arguments from the wire format
 
 use std::collections::VecDeque;
-use std::convert::TryInto;
 use std::ffi::CStr;
 use std::os::unix::io::RawFd;
 use std::os::unix::io::{BorrowedFd, OwnedFd};
diff --git a/wayland-backend/src/server_api.rs b/wayland-backend/src/server_api.rs
index 6e3565db1c0..08f48fd1ae5 100644
--- a/wayland-backend/src/server_api.rs
+++ b/wayland-backend/src/server_api.rs
@@ -1,3 +1,6 @@
+// Suppress lint in `impl_downcast!`
+#![allow(clippy::multiple_bound_locations)]
+
 use std::{
     ffi::CString,
     fmt,
diff --git a/wayland-backend/src/sys/client_impl/mod.rs b/wayland-backend/src/sys/client_impl/mod.rs
index 6939314fe76..dfd33703247 100644
--- a/wayland-backend/src/sys/client_impl/mod.rs
+++ b/wayland-backend/src/sys/client_impl/mod.rs
@@ -29,8 +29,6 @@ use smallvec::SmallVec;
 
 use wayland_sys::{client::*, common::*, ffi_dispatch};
 
-pub use crate::types::client::{InvalidId, NoWaylandLib, WaylandError};
-
 use super::{free_arrays, RUST_MANAGED};
 
 use super::client::*;
diff --git a/wayland-server/src/socket.rs b/wayland-server/src/socket.rs
index 1b594ab1b5e..d25c21ecf3f 100644
--- a/wayland-server/src/socket.rs
+++ b/wayland-server/src/socket.rs
@@ -86,6 +86,7 @@ impl ListeningSocket {
                 .create(true)
                 .read(true)
                 .write(true)
+                .truncate(true)
                 .mode(0o660)
                 .open(&lock_path)
                 .map_err(|_| BindError::PermissionDenied)?;