Skip to content

Commit

Permalink
Merge pull request steveklabnik#215 from hjr3/flag-compat
Browse files Browse the repository at this point in the history 
Create flag-compatible infrastructure
  • Loading branch information
@steveklabnik
steveklabnik authored Dec 31, 2017
2 parents 8679bce + b864a9e commit 477d8bf
Show file tree
Hide file tree
Showing 2 changed files with 230 additions and 17 deletions.
18 changes: 18 additions & 0 deletions src/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,21 @@ pub struct Json {
/// The location of the unexpected JSON
pub location: String,
}

/// Thrown when a flag, supported in the original rustdoc, is no longer supported
#[derive(Debug, Fail)]
#[fail(display = "Unsupported flag: {}", flag_name)]
pub struct UnsupportedFlag {
/// The name of the unsupported flag
pub flag_name: String,
}

/// Thrown when a flag, supported in the original rustdoc, has been moved
#[derive(Debug, Fail)]
#[fail(display = "The flag '{}' has been changed. {}", flag_name, msg)]
pub struct MovedFlag {
/// The name of the unsupported flag
pub flag_name: String,
/// A message explaning where the flag moved to
pub msg: String,
}
229 changes: 212 additions & 17 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
extern crate clap;
extern crate rustdoc;

use clap::{App, Arg, SubCommand};
use clap::{App, Arg, ArgMatches, SubCommand};

use rustdoc::{build, Config, Result, Verbosity};
use rustdoc::{build, error, Config, Result, Verbosity};

use std::io::{stderr, Write};
use std::process;
Expand All @@ -30,18 +30,94 @@ fn run() -> Result<()> {
.default_value("./Cargo.toml")
.help("The path to the Cargo manifest of the project you are documenting."),
)
.arg(Arg::with_name("quiet").short("q").long("quiet").help(
"No output printed to stdout",
))
.arg(Arg::with_name("verbose").short("v").long("verbose").help(
"Use verbose output",
))

// Flags that may be unsupported soon. Unimplemented for now.
.arg(Arg::with_name("markdown-css").long("markdown-css").takes_value(true).help(
"CSS files to include via <link> in a rendered Markdown file",
))
.arg(Arg::with_name("html-in-header").long("html-in-header").takes_value(true).help(
"Files to include inline in the <head> section of a rendered Markdown file or \
generated documentation",
))
.arg(
Arg::with_name("html-before-content")
.long("html-before-content")
.takes_value(true)
.help("Files to include inline between <body> and the content of a rendered \
Markdown file or generated documentation",)
)
.arg(
Arg::with_name("quiet")
.short("q")
.long("quiet")
.help("No output printed to stdout"),
Arg::with_name("html-after-content")
.long("html-after-content")
.takes_value(true)
.help("Files to include inline between the content and </body> of a rendered \
Markdown file or generated documentation",)
)
.arg(
Arg::with_name("verbose")
.short("v")
.long("verbose")
.help("Use verbose output"),
Arg::with_name("markdown-before-content")
.long("markdown-before-content")
.takes_value(true)
.help("Files to include inline between <body> and the content of a rendered \
Markdown file or generated documentation",)
)
.arg(
Arg::with_name("markdown-after-content")
.long("markdown-after-content")
.takes_value(true)
.help("Files to include inline between the content and </body> of a rendered \
Markdown file or generated documentation",)
)
.arg(
Arg::with_name("markdown-playground-url")
.long("markdown-playground-url")
.takes_value(true)
.help("URL to send code snippets to",)
)
.arg(Arg::with_name("markdown-no-toc").long("markdown-no-toc").help(
"Do not include table of contents",
))
.arg(Arg::with_name("extend-css").short("e").long("extend-css").takes_value(true).help(
"To add some CSS rules with a given file to generate doc with your own theme. However, \
your theme might break if the rustdoc's generated HTML changes, so be careful!",
))

// Unsupported flags
.arg(
Arg::with_name("input-format")
.short("r")
.long("input-format")
.takes_value(true)
.hidden(true)
)
.arg(
Arg::with_name("output-format")
.short("w")
.long("output-format")
.takes_value(true)
.hidden(true)
)
.arg(Arg::with_name("plugin-path").long("plugin-path").takes_value(true).hidden(true))
.arg(Arg::with_name("passes").long("passes").takes_value(true).hidden(true))
.arg(Arg::with_name("plugins").long("plugins").takes_value(true).hidden(true))
.arg(Arg::with_name("no-defaults").long("no-defaults").hidden(true))

// Renamed flags
.arg(Arg::with_name("output").short("o").long("output").takes_value(true).hidden(true))
.arg(Arg::with_name("crate-name").long("crate-name").takes_value(true).hidden(true))
.arg(Arg::with_name("library-path").takes_value(true).hidden(true))
.arg(Arg::with_name("cfg").long("cfg").takes_value(true).hidden(true))
.arg(Arg::with_name("extern").long("extern").takes_value(true).hidden(true))
.arg(Arg::with_name("target").long("target").takes_value(true).hidden(true))
.arg(Arg::with_name("sysroot").long("sysroot").takes_value(true).hidden(true))
.arg(Arg::with_name("test").long("test").hidden(true))
.arg(Arg::with_name("test-args").long("test-args").hidden(true))

.subcommand(
SubCommand::with_name("build")
.about("generates documentation")
Expand All @@ -53,19 +129,52 @@ fn run() -> Result<()> {
.possible_values(ALL_ARTIFACTS)
.help("Build artifacts to produce. Defaults to just the frontend."),
)
.arg(Arg::with_name("open").long("open").help(
"Open the docs in a web browser after building.",
))
.arg(Arg::with_name("output").short("o").long("output").takes_value(true).help(
"Path to place the output",
))
.arg(Arg::with_name("crate-name").long("crate-name").takes_value(true).help(
"Specify the name of this crate",
))
.arg(
Arg::with_name("open")
.short("o")
.long("open")
.help("Open the docs in a web browser after building."),
),
Arg::with_name("library-path")
.short("L")
.long("library-path")
.takes_value(true)
.use_delimiter(true)
.help("A list of directories to add to crate search path")
)
.arg(Arg::with_name("cfg").long("cfg").takes_value(true).help(
"Pass a --cfg to rustc",
))
.arg(Arg::with_name("extern").long("extern").takes_value(true).help(
"Pass an --extern to rustc",
))
.arg(Arg::with_name("target").long("target").takes_value(true).help(
"Target triple to document",
))
.arg(Arg::with_name("sysroot").long("sysroot").takes_value(true).help(
"Override the system root",
)),
)
.subcommand(SubCommand::with_name("open").about("opens the documentation in a web browser"))
.subcommand(SubCommand::with_name("open").about(
"opens the documentation in a web browser",
))
.subcommand(
SubCommand::with_name("test").about("runs documentation tests in the current crate"),
SubCommand::with_name("test")
.about("runs documentation tests in the current crate")
.arg(Arg::with_name("test-args").long("test-args").help(
"Arguments to pass to the test runner",
)),
)
.get_matches();

check_unsupported_flags(&matches)?;
check_moved_flags(&matches)?;
check_unimplemented_flags(&matches);

// unwrap is okay because we take a default value
let manifest_path = PathBuf::from(&matches.value_of("manifest-path").unwrap());
let verbosity = if matches.is_present("quiet") {
Expand Down Expand Up @@ -106,6 +215,92 @@ fn run() -> Result<()> {
Ok(())
}

fn check_moved_flags(matches: &ArgMatches) -> Result<()> {
let build_msg = "Use in conjunction with the build subcommand.";
let moved_flags = [
("output", build_msg),
("crate-name", build_msg),
("library-path", build_msg),
("cfg", build_msg),
("extern", build_msg),
("target", build_msg),
("sysroot", build_msg),
("test", "Use in conjunction with the test subcommand."),
("test", "Use the test subcommand."),
];

for &(flag, err_msg) in moved_flags.iter() {
if matches.is_present(flag) {
return Err(error::MovedFlag {
flag_name: flag.to_string(),
msg: err_msg.to_string(),
}.into());
}
}

Ok(())
}

fn check_unsupported_flags(matches: &ArgMatches) -> Result<()> {
let unsupported_flags = [
"input-format",
"output-format",
"plugin-path",
"passes",
"plugins",
"no-defaults",
];

for flag in unsupported_flags.iter() {
if matches.is_present(flag) {
return Err(error::UnsupportedFlag {
flag_name: flag.to_string(),
}.into());
}
}

Ok(())
}

fn check_unimplemented_flags(matches: &ArgMatches) {
let unimplemented_flags = [
"markdown-css",
"html-in-header",
"html-before-content",
"html-after-content",
"markdown-before-content",
"markdown-after-content",
"markdown-playground-url",
"markdown-no-toc",
"extend-css",
];

let unimplemented_build_flags = [
"output",
"crate-name",
"library-path",
"cfg",
"extern",
"target",
"sysroot",
];

for flag in unimplemented_flags.iter() {
if matches.is_present(flag) {
unimplemented!("Flag {} is not implemented", flag);
}
}

match matches.subcommand() {
("build", Some(matches)) => for flag in unimplemented_build_flags.iter() {
if matches.is_present(flag) {
unimplemented!("Flag {} is not implemented", flag);
}
},
_ => {} // do nothing
}
}

fn main() {
if let Err(e) = run() {
let stderr = &mut stderr();
Expand Down

0 comments on commit 477d8bf

Please sign in to comment.