diff --git a/builder/build/arch/apple.rs b/builder/build/arch/apple.rs index 33d9f2ff8..83d60526d 100644 --- a/builder/build/arch/apple.rs +++ b/builder/build/arch/apple.rs @@ -14,7 +14,7 @@ pub const BUILD_CRASHTRACKER: bool = true; pub fn fix_rpath(lib_path: &str) { if REMOVE_RPATH { - let lib_name = lib_path.split("/").last().unwrap(); + let lib_name = lib_path.split('/').last().unwrap(); Command::new("install_name_tool") .arg("-id") diff --git a/ipc/src/platform/unix/mem_handle_macos.rs b/ipc/src/platform/unix/mem_handle_macos.rs index 3ae4af8c8..bd26c0e50 100644 --- a/ipc/src/platform/unix/mem_handle_macos.rs +++ b/ipc/src/platform/unix/mem_handle_macos.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::platform::{ - FileBackedHandle, MappedMem, MemoryHandle, NamedShmHandle, PlatformHandle, ShmHandle, ShmPath, + FileBackedHandle, MappedMem, MemoryHandle, NamedShmHandle, ShmHandle, ShmPath, }; use libc::off_t; use nix::errno::Errno; @@ -14,7 +14,6 @@ use std::ffi::{CStr, CString}; use std::io; use std::num::NonZeroUsize; use std::os::fd::OwnedFd; -use std::os::unix::prelude::{AsRawFd, FromRawFd, RawFd}; use std::sync::atomic::{AtomicI32, AtomicUsize, Ordering}; const MAPPING_MAX_SIZE: usize = 1 << 17; // 128 MiB ought to be enough for everybody? diff --git a/sidecar/src/service/sidecar_server.rs b/sidecar/src/service/sidecar_server.rs index eb8cc1ca5..a5d63ed01 100644 --- a/sidecar/src/service/sidecar_server.rs +++ b/sidecar/src/service/sidecar_server.rs @@ -954,7 +954,7 @@ impl SidecarInterface for SidecarServer { token: &Option>, ) { if let Some(mut endpoint) = endpoint { - endpoint.test_token = token.clone(); + endpoint.test_token.clone_from(token); set(endpoint).ok(); } }