mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept 2015 and 2018 instead of Edition2015 and Edition2018 for edition option

Browse Source
This commit is contained in:
Ryan Leckey 2018-08-31 00:04:23 -07:00
parent d88139893f
commit eec74360dc
16 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -35,7 +35,7 @@ matrix:
- env: INTEGRATION=stdsimd
- env: INTEGRATION=tempdir
allow_failures:
# Needs `edition = "Edition2018"` in rustfmt.toml
# Needs `edition = "2018"` in rustfmt.toml
- env: INTEGRATION=chalk
# Fails tests, don't know why
- env: INTEGRATION=crater

6
Configurations.md
View File

@ -2176,8 +2176,8 @@ ignore = [
Specifies which edition is used by the parser.
- **Default value**: `Edition2015`
- **Possible values**: `Edition2015`, `Edition2018`
- **Default value**: `2015`
- **Possible values**: `2015`, `2018`
- **Stable**: No
### Example
@ -2185,7 +2185,7 @@ Specifies which edition is used by the parser.
If you want to format code that requires edition 2018, add the following to your config file:
```toml
edition = "Edition2018"
edition = "2018"
```
## `emit_mode`

2
README.md
View File

@ -39,7 +39,7 @@ cargo +nightly fmt
To format code that requires edition 2018, create a `rustfmt.toml` [configuration](#configuring-rustfmt) file containing:
```toml
edition = "Edition2018"
edition = "2018"
```
## Limitations

2
rustfmt.toml
View File

@ -1,3 +1,3 @@
error_on_line_overflow = true
error_on_unformatted = true
edition = "Edition2018"
edition = "2018"

45
src/config/options.rs
View File

@ -20,7 +20,15 @@
/// Macro for deriving implementations of Serialize/Deserialize for enums
#[macro_export]
macro_rules! impl_enum_serialize_and_deserialize {
( $e:ident, $( $x:ident ),* ) => {
(@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>
where S: ::serde::ser::Serializer
@ -31,7 +39,9 @@ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
#[allow(unreachable_patterns)]
match *self {
$(
$e::$x => serializer.serialize_str(stringify!($x)),
$e::$variant => serializer.serialize_str(
impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
),
)*
_ => {
Err(S::Error::custom(format!("Cannot serialize {:?}", self)))
@ -59,11 +69,13 @@ fn visit_str<E>(self, value: &str) -> Result<String, E> {
}
let s = d.deserialize_string(StringOnly::<D>(PhantomData))?;
$(
if stringify!($x).eq_ignore_ascii_case(&s) {
return Ok($e::$x);
if impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
.eq_ignore_ascii_case(&s) {
return Ok($e::$variant);
}
)*
static ALLOWED: &'static[&str] = &[$(stringify!($x),)*];
static ALLOWED: &'static[&str] = &[
$(impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*),)*];
Err(D::Error::unknown_variant(&s, ALLOWED))
}
}
@ -73,8 +85,9 @@ impl ::std::str::FromStr for $e {
fn from_str(s: &str) -> Result<Self, Self::Err> {
$(
if stringify!($x).eq_ignore_ascii_case(s) {
return Ok($e::$x);
if impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
.eq_ignore_ascii_case(s) {
return Ok($e::$variant);
}
)*
Err("Bad variant")
@ -85,7 +98,9 @@ impl ConfigType for $e {
fn doc_hint() -> String {
let mut variants = Vec::new();
$(
variants.push(stringify!($x));
variants.push(
impl_enum_serialize_and_deserialize!(@stringify $variant $(: $value)*)
);
)*
format!("[{}]", variants.join("|"))
}
@ -93,15 +108,15 @@ fn doc_hint() -> String {
};
}
macro_rules! configuration_option_enum{
($e:ident: $( $x:ident ),+ $(,)*) => {
macro_rules! configuration_option_enum {
($e:ident: $( $name:ident $(: $value:expr)* ),+ $(,)*) => (
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
pub enum $e {
$( $x ),+
$( $name ),+
}
impl_enum_serialize_and_deserialize!($e, $( $x ),+);
}
impl_enum_serialize_and_deserialize!($e, $( $name $(: $value)* ),+);
);
}
configuration_option_enum! { NewlineStyle:
@ -412,8 +427,8 @@ pub trait CliOptions {
/// The edition of the compiler (RFC 2052)
configuration_option_enum!{ Edition:
Edition2015,
Edition2018,
Edition2015: 2015,
Edition2018: 2018,
}
impl Edition {

2
tests/source/async_block.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
fn main() {
let x = async {

2
tests/source/async_fn.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
async fn bar() -> Result<(), ()> {
Ok(())

2
tests/source/catch.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
#![feature(try_blocks)]
fn main() {

2
tests/source/issue-2927-2.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2015
// rustfmt-edition: 2015
#![feature(rust_2018_preview, uniform_paths)]
use futures::prelude::*;
use http_03::cli::Cli;

2
tests/source/issue-2927.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
#![feature(rust_2018_preview, uniform_paths)]
use futures::prelude::*;
use http_03::cli::Cli;

2
tests/target/async_block.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
fn main() {
let x = async { Ok(()) };

2
tests/target/async_closure.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
fn main() {
let async_closure = async {

2
tests/target/async_fn.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
async fn bar() -> Result<(), ()> {
Ok(())

2
tests/target/catch.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
#![feature(try_blocks)]
fn main() {

2
tests/target/issue-2927-2.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2015
// rustfmt-edition: 2015
#![feature(rust_2018_preview, uniform_paths)]
use futures::prelude::*;
use http_03::cli::Cli;

2
tests/target/issue-2927.rs
View File

@ -1,4 +1,4 @@
// rustfmt-edition: Edition2018
// rustfmt-edition: 2018
#![feature(rust_2018_preview, uniform_paths)]
use ::log::{error, info, log};
use futures::prelude::*;