summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vo <auscompgeek@users.noreply.github.com>2019-11-15 00:26:41 +1100
committerEmilio Cobos Álvarez <emilio@crisal.io>2019-11-14 17:35:38 +0100
commit5f4dc4f458f0fd14beafbacb8bb20a5a4d139cd5 (patch)
treebb5a46817ed8c7e379a718719440dbc84ca18a65
parentac498475e04b44e3c555002213fa9cba0658198e (diff)
Make rustfmt happy
-rw-r--r--src/codegen/mod.rs20
-rw-r--r--src/ir/enum_ty.rs7
-rw-r--r--src/lib.rs12
3 files changed, 22 insertions, 17 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 90314a57..1fad91f4 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -2323,16 +2323,24 @@ impl std::str::FromStr for EnumVariation {
/// Create a `EnumVariation` from a string.
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
- "rust" => Ok(EnumVariation::Rust{ non_exhaustive: false }),
- "rust_non_exhaustive" => Ok(EnumVariation::Rust{ non_exhaustive: true }),
+ "rust" => Ok(EnumVariation::Rust {
+ non_exhaustive: false,
+ }),
+ "rust_non_exhaustive" => Ok(EnumVariation::Rust {
+ non_exhaustive: true,
+ }),
"bitfield" => Ok(EnumVariation::NewType { is_bitfield: true }),
"consts" => Ok(EnumVariation::Consts),
"moduleconsts" => Ok(EnumVariation::ModuleConsts),
"newtype" => Ok(EnumVariation::NewType { is_bitfield: false }),
- _ => Err(std::io::Error::new(std::io::ErrorKind::InvalidInput,
- concat!("Got an invalid EnumVariation. Accepted values ",
- "are 'rust', 'rust_non_exhaustive', 'bitfield', 'consts',",
- "'moduleconsts', and 'newtype'."))),
+ _ => Err(std::io::Error::new(
+ std::io::ErrorKind::InvalidInput,
+ concat!(
+ "Got an invalid EnumVariation. Accepted values ",
+ "are 'rust', 'rust_non_exhaustive', 'bitfield', 'consts',",
+ "'moduleconsts', and 'newtype'."
+ ),
+ )),
}
}
}
diff --git a/src/ir/enum_ty.rs b/src/ir/enum_ty.rs
index 95e7e1fa..f2013844 100644
--- a/src/ir/enum_ty.rs
+++ b/src/ir/enum_ty.rs
@@ -184,11 +184,8 @@ impl Enum {
item,
) {
EnumVariation::NewType { is_bitfield: true }
- } else if self.is_matching_enum(
- ctx,
- &ctx.options().newtype_enums,
- item,
- ) {
+ } else if self.is_matching_enum(ctx, &ctx.options().newtype_enums, item)
+ {
EnumVariation::NewType { is_bitfield: false }
} else if self.is_matching_enum(
ctx,
diff --git a/src/lib.rs b/src/lib.rs
index c15d20bc..8c8dd198 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -236,12 +236,12 @@ impl Builder {
codegen::EnumVariation::Rust {
non_exhaustive: true,
} => "rust_non_exhaustive",
- codegen::EnumVariation::NewType {
- is_bitfield: true,
- } => "bitfield",
- codegen::EnumVariation::NewType {
- is_bitfield: false,
- } => "newtype",
+ codegen::EnumVariation::NewType { is_bitfield: true } => {
+ "bitfield"
+ }
+ codegen::EnumVariation::NewType { is_bitfield: false } => {
+ "newtype"
+ }
codegen::EnumVariation::Consts => "consts",
codegen::EnumVariation::ModuleConsts => "moduleconsts",
}