T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some clippy warnings (#536)

Browse Source
This commit is contained in:
Marcin Mielniczuk
2019-11-10 22:50:19 +01:00
committed by Dan Gohman
parent ef1cbfdaa8
commit 3206461502
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/environ/src/cache.rs
View File

@@ -39,11 +39,13 @@ lazy_static! {
.map_err(|_| warn!("Failed to get metadata of current executable")) .map_err(|_| warn!("Failed to get metadata of current executable"))
.ok() .ok()
}) })
.map(|mtime| match mtime.duration_since(std::time::UNIX_EPOCH) { .map_or_else(
Ok(duration) => format!("{}", duration.as_millis()), || "no-mtime".to_string(),
Err(err) => format!("m{}", err.duration().as_millis()), |mtime| match mtime.duration_since(std::time::UNIX_EPOCH) {
}) Ok(duration) => format!("{}", duration.as_millis()),
.unwrap_or_else(|| "no-mtime".to_string()) Err(err) => format!("m{}", err.duration().as_millis()),
},
)
}; };
} }

2
crates/environ/src/lib.rs
View File

@@ -9,7 +9,7 @@
#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] #![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))]
#![cfg_attr( #![cfg_attr(
feature = "cargo-clippy", feature = "cargo-clippy",
allow(clippy::new_without_default, clippy::new_without_default_derive) allow(clippy::new_without_default, clippy::new_without_default)
)] )]
#![cfg_attr( #![cfg_attr(
feature = "cargo-clippy", feature = "cargo-clippy",

2
crates/jit/src/lib.rs
View File

@@ -6,7 +6,7 @@
#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] #![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))]
#![cfg_attr( #![cfg_attr(
feature = "cargo-clippy", feature = "cargo-clippy",
allow(clippy::new_without_default, clippy::new_without_default_derive) allow(clippy::new_without_default, clippy::new_without_default)
)] )]
#![cfg_attr( #![cfg_attr(
feature = "cargo-clippy", feature = "cargo-clippy",

2
crates/runtime/src/lib.rs
View File

@@ -6,7 +6,7 @@
#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] #![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))]
#![cfg_attr( #![cfg_attr(
feature = "cargo-clippy", feature = "cargo-clippy",
allow(clippy::new_without_default, clippy::new_without_default_derive) allow(clippy::new_without_default, clippy::new_without_default)
)] )]
#![cfg_attr( #![cfg_attr(
feature = "cargo-clippy", feature = "cargo-clippy",

8
crates/wasi-common/src/ctx.rs
View File

@@ -15,12 +15,12 @@ enum PendingFdEntry {
impl std::fmt::Debug for PendingFdEntry { impl std::fmt::Debug for PendingFdEntry {
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
PendingFdEntry::Thunk(f) => write!( Self::Thunk(f) => write!(
fmt, fmt,
"PendingFdEntry::Thunk({:p})", "PendingFdEntry::Thunk({:p})",
f as *const fn() -> Result<FdEntry> f as *const fn() -> Result<FdEntry>
), ),
PendingFdEntry::File(f) => write!(fmt, "PendingFdEntry::File({:?})", f), Self::File(f) => write!(fmt, "PendingFdEntry::File({:?})", f),
} }
} }
} }
@@ -46,8 +46,8 @@ impl From<OsString> for PendingCString {
impl PendingCString { impl PendingCString {
fn into_string(self) -> Result<String> { fn into_string(self) -> Result<String> {
match self { match self {
PendingCString::Bytes(v) => String::from_utf8(v).map_err(|_| Error::EILSEQ), Self::Bytes(v) => String::from_utf8(v).map_err(|_| Error::EILSEQ),
PendingCString::OsString(s) => s.into_string().map_err(|_| Error::EILSEQ), Self::OsString(s) => s.into_string().map_err(|_| Error::EILSEQ),
} }
} }

3
crates/wasi-common/src/lib.rs
View File

@@ -2,7 +2,8 @@
// missing_docs, // missing_docs,
trivial_numeric_casts, trivial_numeric_casts,
unused_extern_crates, unused_extern_crates,
unstable_features unstable_features,
clippy::use_self
)] )]
#![warn(unused_import_braces)] #![warn(unused_import_braces)]
#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../clippy.toml")))] #![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../clippy.toml")))]