Skip to content

Commit

Permalink
Support unstable options
Browse files Browse the repository at this point in the history 
cc #1976
  • Loading branch information
@nrc
nrc committed May 13, 2018
1 parent 5d9f5aa commit 3b23a98
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 61 deletions.
73 changes: 40 additions & 33 deletions src/bin/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,6 @@ fn make_opts() -> Options {
"[Path for the configuration file]",
);
opts.optopt("", "emit", "What data to emit and how", WRITE_MODE_LIST);
opts.optflag(
"",
"error-on-unformatted",
"Error if unable to get comments or string literals within max_width, \
or they are left with trailing whitespaces",
);
opts.optopt(
"",
"file-lines",
"Format specified line ranges. Run with `--help file-lines` for more detail.",
"JSON",
);
opts.optflagopt(
"h",
"help",
Expand All @@ -137,21 +125,48 @@ fn make_opts() -> Options {
subset of the current config file used for formatting the current program.",
"[minimal|default] PATH",
);
opts.optflag("", "skip-children", "Don't reformat child modules");
opts.optflag(
"",
"unstable-features",
"Enables unstable features. Only available on nightly channel",
);
opts.optflag("v", "verbose", "Print verbose output");
opts.optflag("q", "quiet", "Print less output");
opts.optflag("V", "version", "Show version information");

if is_nightly() {
opts.optflag(
"",
"unstable-features",
"Enables unstable features. Only available on nightly channel.",
);
opts.optflag(
"",
"error-on-unformatted",
"Error if unable to get comments or string literals within max_width, \
or they are left with trailing whitespaces (unstable).",
);
opts.optopt(
"",
"file-lines",
"Format specified line ranges. Run with `--help file-lines` for \
more detail (unstable).",
"JSON",
);
opts.optflag(
"",
"skip-children",
"Don't reformat child modules (unstable).",
);
}

opts
}

fn is_nightly() -> bool {
option_env!("CFG_RELEASE_CHANNEL")
.map(|c| c == "nightly")
.unwrap_or(false)
}

fn execute(opts: &Options) -> FmtResult<(WriteMode, Summary)> {
let matches = opts.parse(env::args().skip(1))?;
let options = CliOptions::from_matches(&matches)?;

match determine_operation(&matches)? {
Operation::Help(HelpOp::None) => {
Expand All @@ -160,7 +175,7 @@ fn execute(opts: &Options) -> FmtResult<(WriteMode, Summary)> {
Ok((WriteMode::None, Summary::default()))
}
Operation::Help(HelpOp::Config) => {
Config::print_docs(&mut stdout(), matches.opt_present("unstable-features"));
Config::print_docs(&mut stdout(), options.unstable_features);
Ok((WriteMode::None, Summary::default()))
}
Operation::Help(HelpOp::FileLines) => {
Expand All @@ -183,23 +198,18 @@ fn execute(opts: &Options) -> FmtResult<(WriteMode, Summary)> {
}
Operation::Stdin { input } => {
// try to read config from local directory
let options = CliOptions::from_matches(&matches)?;
let (mut config, _) = load_config(Some(Path::new(".")), Some(&options))?;

// write_mode is always Display for Stdin.
config.set().write_mode(WriteMode::Display);
config.set().verbose(Verbosity::Quiet);

// parse file_lines
if let Some(ref file_lines) = matches.opt_str("file-lines") {
config
.set()
.file_lines(file_lines.parse().map_err(err_msg)?);
for f in config.file_lines().files() {
match *f {
FileName::Custom(ref f) if f == "stdin" => {}
_ => eprintln!("Warning: Extra file listed in file_lines option '{}'", f),
}
config.set().file_lines(options.file_lines);
for f in config.file_lines().files() {
match *f {
FileName::Custom(ref f) if f == "stdin" => {}
_ => eprintln!("Warning: Extra file listed in file_lines option '{}'", f),
}
}

Expand All @@ -216,10 +226,7 @@ fn execute(opts: &Options) -> FmtResult<(WriteMode, Summary)> {
Operation::Format {
files,
minimal_config_path,
} => {
let options = CliOptions::from_matches(&matches)?;
format(files, minimal_config_path, options)
}
} => format(files, minimal_config_path, options),
}
}

Expand Down
52 changes: 24 additions & 28 deletions src/config/options.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,16 +327,16 @@ impl ::std::str::FromStr for IgnoreList {
/// Parsed command line options.
#[derive(Clone, Debug, Default)]
pub struct CliOptions {
skip_children: Option<bool>,
quiet: bool,
verbose: bool,
pub(super) config_path: Option<PathBuf>,
write_mode: Option<WriteMode>,
check: bool,
color: Option<Color>,
file_lines: FileLines, // Default is all lines in all files.
unstable_features: bool,
error_on_unformatted: Option<bool>,
pub skip_children: Option<bool>,
pub quiet: bool,
pub verbose: bool,
pub config_path: Option<PathBuf>,
pub write_mode: Option<WriteMode>,
pub check: bool,
pub color: Option<Color>,
pub file_lines: FileLines, // Default is all lines in all files.
pub unstable_features: bool,
pub error_on_unformatted: Option<bool>,
}

impl CliOptions {
Expand All @@ -348,16 +348,23 @@ impl CliOptions {
return Err(format_err!("Can't use both `--verbose` and `--quiet`"));
}

let unstable_features = matches.opt_present("unstable-features");
let rust_nightly = option_env!("CFG_RELEASE_CHANNEL")
.map(|c| c == "nightly")
.unwrap_or(false);
if unstable_features && !rust_nightly {
return Err(format_err!(
"Unstable features are only available on Nightly channel"
));
} else {
options.unstable_features = unstable_features;
if rust_nightly {
options.unstable_features = matches.opt_present("unstable-features");
}

if options.unstable_features {
if matches.opt_present("skip-children") {
options.skip_children = Some(true);
}
if matches.opt_present("error-on-unformatted") {
options.error_on_unformatted = Some(true);
}
if let Some(ref file_lines) = matches.opt_str("file-lines") {
options.file_lines = file_lines.parse().map_err(err_msg)?;
}
}

options.config_path = matches.opt_str("config-path").map(PathBuf::from);
Expand Down Expand Up @@ -389,17 +396,6 @@ impl CliOptions {
}
}

if let Some(ref file_lines) = matches.opt_str("file-lines") {
options.file_lines = file_lines.parse().map_err(err_msg)?;
}

if matches.opt_present("skip-children") {
options.skip_children = Some(true);
}
if matches.opt_present("error-on-unformatted") {
options.error_on_unformatted = Some(true);
}

Ok(options)
}

Expand Down

0 comments on commit 3b23a98

Please sign in to comment.