Skip to content

Commit

Permalink
Auto merge of #49182 - matklad:update-clap, r=kennytm
Browse files Browse the repository at this point in the history 
Update clap

This should fix a regression in Cargo after swithing to clap, when
an external subcommand was not discovered, if its name was close to
a built in command.

bug report: #48986 (comment)
fix: clap-rs/clap#1215
  • Loading branch information
@bors
bors committed Mar 20, 2018
2 parents 75af15e + 8d97747 commit a76d9c7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions src/Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 19 files
+1 −1 Cargo.toml
+1 −1 src/bin/cargo.rs
+25 −4 src/bin/command_prelude.rs
+1 −1 src/bin/commands/init.rs
+2 −2 src/bin/commands/install.rs
+1 −1 src/bin/commands/new.rs
+336 −165 src/cargo/core/resolver/mod.rs
+11 −12 src/cargo/ops/cargo_new.rs
+2 −2 src/cargo/ops/registry.rs
+1 −1 src/cargo/ops/resolve.rs
+5 −39 src/cargo/util/important_paths.rs
+1 −10 tests/testsuite/build.rs
+83 −12 tests/testsuite/cargo_command.rs
+6 −1 tests/testsuite/cargotest/support/mod.rs
+2 −16 tests/testsuite/clean.rs
+52 −2 tests/testsuite/resolve.rs
+3 −10 tests/testsuite/run.rs
+5 −34 tests/testsuite/rustc.rs
+3 −23 tests/testsuite/test.rs

0 comments on commit a76d9c7

Please sign in to comment.