Skip to content

Commit

Permalink
Merge pull request #5891 from ModProg/derive-markdown
Browse files Browse the repository at this point in the history
Markdown parsing in doc comments
  • Loading branch information
epage authored Feb 3, 2025
2 parents 349bd3c + 58308ab commit c99872c
Show file tree
Hide file tree
Showing 13 changed files with 922 additions and 26 deletions.
50 changes: 48 additions & 2 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ unstable-v5 = ["clap_builder/unstable-v5", "clap_derive?/unstable-v5", "deprecat
unstable-ext = ["clap_builder/unstable-ext"]
unstable-styles = ["clap_builder/unstable-styles"] # deprecated
unstable-derive-ui-tests = []
unstable-markdown = ["clap_derive/unstable-markdown"]

[lib]
bench = false
Expand All @@ -184,7 +185,7 @@ rustversion = "1.0.15"
# Cutting out `filesystem` feature
trycmd = { version = "0.15.3", default-features = false, features = ["color-auto", "diff", "examples"] }
humantime = "2.1.0"
snapbox = "0.6.16"
snapbox = { version = "0.6.16", features = ["term-svg"] }
shlex = "1.3.0"
automod = "1.0.14"
clap-cargo = { version = "0.15.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ _FEATURES_minimal = --no-default-features --features "std"
_FEATURES_default =
_FEATURES_wasm = --no-default-features --features "std help usage error-context suggestions" --features "deprecated derive cargo env unicode string"
_FEATURES_full = --features "deprecated derive cargo env unicode string wrap_help unstable-ext"
_FEATURES_next = ${_FEATURES_full} --features unstable-v5
_FEATURES_next = ${_FEATURES_full} --features "unstable-v5 unstable-markdown"
_FEATURES_debug = ${_FEATURES_full} --features debug --features clap_complete/debug
_FEATURES_release = ${_FEATURES_full} --release

Expand Down
3 changes: 3 additions & 0 deletions clap_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@ syn = { version = "2.0.8", features = ["full"] }
quote = "1.0.9"
proc-macro2 = "1.0.69"
heck = "0.5.0"
pulldown-cmark = { version = "0.12.2", default-features = false, optional = true}
anstyle = {version ="1.0.10", optional = true}

[features]
default = []
debug = []
unstable-v5 = ["deprecated"]
deprecated = []
raw-deprecated = ["deprecated"]
unstable-markdown = ["dep:pulldown-cmark", "dep:anstyle"]

[lints]
workspace = true
Loading

0 comments on commit c99872c

Please sign in to comment.