Mirrors/cargo-play
2
0
Fork 0
mirror of https://github.com/fanzeyi/cargo-play synced 2024-11-12 22:17:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support Rust Edition 2021 (#70)

Browse source 
* Support Rust Edition 2021

* Update src/options.rs

Co-authored-by: Yerkebulan Tulibergenov <yerkebulan@gmail.com>

Co-authored-by: Yerkebulan Tulibergenov <yerkebulan@gmail.com>
This commit is contained in:
Kobato 2022-03-03 20:33:25 -08:00 committed by GitHub
parent 0675ed185b
commit 21d2787024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/options.rs
View file

@ -11,13 +11,16 @@ use crate::errors::CargoPlayError;
pub enum RustEdition {
E2015,
E2018,
E2021,
}
impl FromStr for RustEdition {
type Err = CargoPlayError;
fn from_str(s: &str) -> Result<Self, Self::Err> {
if s == "2018" {
if s == "2021" {
Ok(RustEdition::E2021)
} else if s == "2018" {
Ok(RustEdition::E2018)
} else if s == "2015" {
Ok(RustEdition::E2015)
@ -32,13 +35,14 @@ impl Into<String> for RustEdition {
match self {
RustEdition::E2015 => "2015".into(),
RustEdition::E2018 => "2018".into(),
RustEdition::E2021 => "2021".into(),
}
}
}
impl Default for RustEdition {
fn default() -> Self {
RustEdition::E2018
RustEdition::E2021
}
}
@ -90,8 +94,8 @@ pub struct Options {
#[structopt(
short = "e",
long = "edition",
default_value = "2018",
possible_values = &["2015", "2018"]
default_value = "2021",
possible_values = &["2015", "2018", "2021"]
)]
/// Specify Rust edition
pub edition: RustEdition,

5
tests/integration_test.rs
View file

@ -152,10 +152,13 @@ fn clean() -> Result<()> {
fn edition() -> Result<()> {
let rt = TestRuntime::new()?;
// default edition is 2018
// default edition is 2021
let output = rt.run(&["fixtures/edition.rs"])?;
assert_ne!(output.status.code().unwrap(), 0);
let output = rt.run(&["--edition", "2021", "fixtures/edition.rs"])?;
assert_ne!(output.status.code().unwrap(), 0);
let output = rt.run(&["--edition", "2018", "fixtures/edition.rs"])?;
assert_ne!(output.status.code().unwrap(), 0);