diff options
| author | bors <bors@rust-lang.org> | 2022-04-16 19:15:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-16 19:15:02 +0000 |
| commit | 878c7833f6c1ff10e2fd89074e5bd4ef5ff15936 (patch) | |
| tree | 3775849e21447f36051ce13cbfa6620fba74fa8e /Cargo.lock | |
| parent | 2fa9789f596dd7639e1a242d466637b53179f4d1 (diff) | |
| parent | 10e0db5666c15ed58abb47aca1ee453e371c406f (diff) | |
| download | rust-878c7833f6c1ff10e2fd89074e5bd4ef5ff15936.tar.gz rust-878c7833f6c1ff10e2fd89074e5bd4ef5ff15936.zip | |
Auto merge of #96123 - Dylan-DPC:rollup-qjog6n1, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #94985 (Parse inner attributes on inline const block) - #95006 (Reject `#[thread_local]` attribute on non-static items) - #95426 (Include Refs in Valtree Creation) - #95908 (Inline `shallow_resolve_ty` into `ShallowResolver`) - #96058 (separate flock implementations into separate modules) - #96088 (Update mdbook) - #96118 (rustdoc: Rename `def_id` into `item_id` when the type is `ItemId` for readability) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9eba61f8d29..73dc7f03236 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -606,6 +606,7 @@ dependencies = [ "atty", "bitflags", "indexmap", + "lazy_static", "os_str_bytes", "strsim 0.10.0", "termcolor", @@ -613,6 +614,15 @@ dependencies = [ ] [[package]] +name = "clap_complete" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25" +dependencies = [ + "clap 3.1.1", +] + +[[package]] name = "clippy" version = "0.1.62" dependencies = [ @@ -2240,14 +2250,15 @@ dependencies = [ [[package]] name = "mdbook" -version = "0.4.15" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6" +checksum = "74612ae81a3e5ee509854049dfa4c7975ae033c06f5fc4735c7dfbe60ee2a39d" dependencies = [ "ammonia", "anyhow", "chrono", - "clap 2.34.0", + "clap 3.1.1", + "clap_complete", "elasticlunr-rs", "env_logger 0.7.1", "handlebars", @@ -2911,7 +2922,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" dependencies = [ "bitflags", - "getopts", "memchr", "unicase", ] @@ -3129,9 +3139,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", |