Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
DouglasDwyer committed Aug 26, 2024
2 parents 9a973f4 + ee39c47 commit 7123c43
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ impl<F: FnOnce()> Drop for ScopeGuard<F> {
pub(crate) mod private {
// This is currently unused on macOS and WASM, so silence the warning which appears
// since there's no extension traits making use of this trait sealing structure.
#[allow(unreachable_pub, unused)]
#[allow(unreachable_pub, unused, dead_code)]
pub trait Sealed {}

impl Sealed for crate::Get<'_> {}
Expand Down
1 change: 0 additions & 1 deletion src/platform/linux/x11.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use std::{
thread::JoinHandle,
thread_local,
time::{Duration, Instant},
usize,
};

use log::{error, trace, warn};
Expand Down

0 comments on commit 7123c43

Please sign in to comment.