Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

housekeeping - merge dependabot changes + fix #issue/1826 #1827

Closed
wants to merge 10 commits into from
Closed

housekeeping - merge dependabot changes + fix #issue/1826 #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc5b076
Bump tokio from 1.10.0 to 1.13.1
dependabot[bot] Jun 6, 2022
c6f2256
Bump ammonia from 3.1.2 to 3.1.3
dependabot[bot] Jun 17, 2022
9091213
Bump hyper from 0.14.11 to 0.14.16
dependabot[bot] Jun 17, 2022
4737bbc
Merge branch 'dependabot/cargo/ammonia-3.1.3' into mergetest
Jun 20, 2022
b8035a4
Merge branch 'dependabot/cargo/tokio-1.13.1' into mergetest
Jun 20, 2022
ab10449
fix #issues/1826
Jun 20, 2022
e9a2eb2
tidy re: fix #issues/1826
Jun 20, 2022
4891ac2
tidy cargo fmt --check
Jun 20, 2022
78903a0
add features edition2021 to Cargo.toml
Jun 20, 2022
682b6c7
seems Clap 3.2.1 requires edition2021
Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cargo-features = ["edition2021"]

[package]
name = "mdbook"
version = "0.4.18"
Expand All @@ -18,8 +20,8 @@ description = "Creates a book from markdown files"
[dependencies]
anyhow = "1.0.28"
chrono = "0.4"
clap = { version = "3.0", features = ["cargo"] }
clap_complete = "3.0"
clap = { version = "3.2.0", features = ["cargo"] }
clap_complete = "3.2.0"
env_logger = "0.7.1"
handlebars = "4.0"
lazy_static = "1.0"
Expand Down
8 changes: 6 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extern crate log;

use anyhow::anyhow;
use chrono::Local;
use clap::{App, AppSettings, Arg, ArgMatches};
use clap::{App, AppSettings, Arg, ArgEnum, ArgMatches};
use clap_complete::Shell;
use env_logger::Builder;
use log::LevelFilter;
Expand Down Expand Up @@ -85,7 +85,11 @@ fn create_clap_app() -> App<'static> {
.arg(
Arg::new("shell")
.takes_value(true)
.possible_values(Shell::possible_values())
.possible_values(
Shell::value_variants()
.iter()
.filter_map(ArgEnum::to_possible_value),
)
.help("the shell to generate completions for")
.value_name("SHELL")
.required(true),
Expand Down