Skip to content

Commit

Permalink
Address nightly clippy lints
Browse files Browse the repository at this point in the history
  • Loading branch information
ids1024 committed Mar 1, 2024
1 parent 1548b5c commit 003ac2c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
3 changes: 3 additions & 0 deletions wayland-backend/src/client_api.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Suppress lint in `impl_downcast!`
#![allow(clippy::multiple_bound_locations)]

Check failure on line 2 in wayland-backend/src/client_api.rs

View workflow job for this annotation

GitHub Actions / clippy-check

unknown lint: `clippy::multiple_bound_locations`

Check failure on line 2 in wayland-backend/src/client_api.rs

View workflow job for this annotation

GitHub Actions / clippy-check

unknown lint: `clippy::multiple_bound_locations`

Check failure on line 2 in wayland-backend/src/client_api.rs

View workflow job for this annotation

GitHub Actions / clippy-check

unknown lint: `clippy::multiple_bound_locations`

Check failure on line 2 in wayland-backend/src/client_api.rs

View workflow job for this annotation

GitHub Actions / clippy-check

unknown lint: `clippy::multiple_bound_locations`

use std::{
any::Any,
fmt,
Expand Down
4 changes: 1 addition & 3 deletions wayland-backend/src/rs/client_impl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ use super::{
wire::MessageParseError,
};

pub use crate::types::client::{InvalidId, NoWaylandLib, WaylandError};

#[derive(Debug, Clone)]
struct Data {
client_destroyed: bool,
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion wayland-backend/src/rs/wire.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
3 changes: 3 additions & 0 deletions wayland-backend/src/server_api.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Suppress lint in `impl_downcast!`
#![allow(clippy::multiple_bound_locations)]

Check failure on line 2 in wayland-backend/src/server_api.rs

View workflow job for this annotation

GitHub Actions / clippy-check

unknown lint: `clippy::multiple_bound_locations`

Check failure on line 2 in wayland-backend/src/server_api.rs

View workflow job for this annotation

GitHub Actions / clippy-check

unknown lint: `clippy::multiple_bound_locations`

Check failure on line 2 in wayland-backend/src/server_api.rs

View workflow job for this annotation

GitHub Actions / clippy-check

unknown lint: `clippy::multiple_bound_locations`

use std::{
ffi::CString,
fmt,
Expand Down
2 changes: 0 additions & 2 deletions wayland-backend/src/sys/client_impl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
1 change: 1 addition & 0 deletions wayland-server/src/socket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ impl ListeningSocket {
.create(true)
.read(true)
.write(true)
.truncate(true)
.mode(0o660)
.open(&lock_path)
.map_err(|_| BindError::PermissionDenied)?;
Expand Down

0 comments on commit 003ac2c

Please sign in to comment.