Skip to content

Commit 569c952

Browse files
authored
Merge branch 'master' into master
2 parents 0cc77c0 + 6e4b80a commit 569c952

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

bridge_macros/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ enum SupportedGenericReturnTypes {
4949
}
5050

5151
enum RustType {
52+
// TypeBareFn is a syn type that is useful to leave attached for debugging purposes.
53+
#[allow(dead_code)]
5254
BareFn(TypeBareFn, Span),
5355
Path(TypePath, Span),
5456
Tuple(TypeTuple, Span),

shell/src/platform/unix.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use std::collections::HashSet;
2-
use std::convert::TryInto;
32
use std::ffi::{c_char, CString, OsStr, OsString};
43
use std::fmt::{Display, Formatter};
54
use std::fs::File;
@@ -235,7 +234,7 @@ impl Platform for Sys {
235234
Err(e) => {
236235
panic!("the CLOEXEC pipe failed: {:?}", e)
237236
}
238-
Ok(..) => {
237+
Ok(_n) => {
239238
// pipe I/O up to PIPE_BUF bytes should be atomic
240239
panic!("short read on the CLOEXEC pipe")
241240
}

0 commit comments

Comments
 (0)