Merge branch 'master' into master

StevenLove · Apr 3, 2024 · 569c952 · 569c952
2 parents 0cc77c0 + 6e4b80a
commit 569c952
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bridge_macros/src/lib.rs b/bridge_macros/src/lib.rs
@@ -49,6 +49,8 @@ enum SupportedGenericReturnTypes {
 }
 
 enum RustType {
+    // TypeBareFn is a syn type that is useful to leave attached for debugging purposes.
+    #[allow(dead_code)]
     BareFn(TypeBareFn, Span),
     Path(TypePath, Span),
     Tuple(TypeTuple, Span),

diff --git a/shell/src/platform/unix.rs b/shell/src/platform/unix.rs
@@ -1,5 +1,4 @@
 use std::collections::HashSet;
-use std::convert::TryInto;
 use std::ffi::{c_char, CString, OsStr, OsString};
 use std::fmt::{Display, Formatter};
 use std::fs::File;
@@ -235,7 +234,7 @@ impl Platform for Sys {
                 Err(e) => {
                     panic!("the CLOEXEC pipe failed: {:?}", e)
                 }
-                Ok(..) => {
+                Ok(_n) => {
                     // pipe I/O up to PIPE_BUF bytes should be atomic
                     panic!("short read on the CLOEXEC pipe")
                 }