nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 18:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3061 from mehcode/feature/default-edition

Browse Source 
Fix help message for edition config option
This commit is contained in:
Nick Cameron 2018-09-28 21:54:29 +12:00 committed by GitHub
commit 4c1b0c2241
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/config/options.rs
View File

@ -17,17 +17,21 @@ use isatty::stdout_isatty;
use std::collections::HashSet;
use std::path::{Path, PathBuf};
/// Macro that will stringify the enum variants or a provided textual repr
#[macro_export]
macro_rules! configuration_option_enum_stringify {
($variant:ident) => {
stringify!($variant)
};
($_variant:ident: $value:expr) => {
stringify!($value)
};
}
/// Macro for deriving implementations of Serialize/Deserialize for enums
#[macro_export]
macro_rules! impl_enum_serialize_and_deserialize {
(@stringify $variant:ident) => (
stringify!($variant)
);
(@stringify $_variant:ident: $value:expr) => (
stringify!($value)
);
( $e:ident, $( $variant:ident $(: $value:expr)* ),* ) => {
impl ::serde::ser::Serialize for $e {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@ -40,7 +44,7 @@ macro_rules! impl_enum_serialize_and_deserialize {
match *self {
$(
$e::$variant => serializer.serialize_str(
impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
configuration_option_enum_stringify!($variant $(: $value)*)
),
)*
_ => {
@ -69,13 +73,13 @@ macro_rules! impl_enum_serialize_and_deserialize {
}
let s = d.deserialize_string(StringOnly::<D>(PhantomData))?;
$(
if impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
if configuration_option_enum_stringify!($variant $(: $value)*)
.eq_ignore_ascii_case(&s) {
return Ok($e::$variant);
}
)*
static ALLOWED: &'static[&str] = &[
$(impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*),)*];
$(configuration_option_enum_stringify!($variant $(: $value)*),)*];
Err(D::Error::unknown_variant(&s, ALLOWED))
}
}
@ -85,7 +89,7 @@ macro_rules! impl_enum_serialize_and_deserialize {
fn from_str(s: &str) -> Result<Self, Self::Err> {
$(
if impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
if configuration_option_enum_stringify!($variant $(: $value)*)
.eq_ignore_ascii_case(s) {
return Ok($e::$variant);
}
@ -99,7 +103,7 @@ macro_rules! impl_enum_serialize_and_deserialize {
let mut variants = Vec::new();
$(
variants.push(
impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
configuration_option_enum_stringify!($variant $(: $value)*)
);
)*
format!("[{}]", variants.join("|"))
@ -110,11 +114,21 @@ macro_rules! impl_enum_serialize_and_deserialize {
macro_rules! configuration_option_enum {
($e:ident: $( $name:ident $(: $value:expr)* ),+ $(,)*) => (
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
#[derive(Copy, Clone, Eq, PartialEq)]
pub enum $e {
$( $name ),+
}
impl ::std::fmt::Debug for $e {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
f.write_str(match self {
$(
$e::$name => configuration_option_enum_stringify!($name $(: $value)*),
)+
})
}
}
impl_enum_serialize_and_deserialize!($e, $( $name $(: $value)* ),+);
);
}