Skip to content

Commit

Permalink
Auto merge of #59681 - dtolnay:cargo, r=alexcrichton
Browse files Browse the repository at this point in the history 
Update cargo

20 commits in
63231f438a2b5b84ccf319a5de22343ee0316323..6f3e9c367abb497c64f360c3839dab5e74928d5c
2019-03-27 12:26:45 +0000 to 2019-04-04 14:11:33 +0000
- Fix Init for Fossil SCM project (rust-lang/cargo#6792)
- Fix member_manifest_version_error accessing the network (rust-lang/cargo#6799)
- Don't include email if it is empty (rust-lang/cargo#6802)
- Fix unused import warning (rust-lang/cargo#6807)
- Add some help and documentation for unstable flags (rust-lang/cargo#6791)
- Allow `cargo doc --open` with multiple packages (rust-lang/cargo#6803)
- Allow `cargo install --path P` to load config from P (rust-lang/cargo#6804)
- Add more suggestions on how to deal with excluding a package from a workspace (rust-lang/cargo#6805)
- Warn on version req with metadata (rust-lang/cargo#6806)
- cargo install: Be more restrictive about cli flags (rust-lang/cargo#6801)
- Support force-pushed repos with git-fetch-with-cli (rust-lang/cargo#6800)
- Cargo clippy (rust-lang/cargo#6759)
- Don't include metadata in wasm binary examples (rust-lang/cargo#6812)
- Update glossary for `feature` (rust-lang/cargo#6809)
- Include proc-macros in `build-override` (rust-lang/cargo#6811)
- Resolver: A dep is equivalent to one of the things it can resolve to (rust-lang/cargo#6776)
- Add some docs for `Downloads` (rust-lang/cargo#6815)
- Resolve: Be less strict while offline (rust-lang/cargo#6814)
- Accept trailing comma in test of impl Debug for PackageId (rust-lang/cargo#6818)
- Fix doc link (rust-lang/cargo#6820)

<br>

I specifically care about "Accept trailing comma in test of impl Debug for PackageId (rust-lang/cargo#6818)" to unblock #59076.

Mentioning @ehuss.
  • Loading branch information
@bors
bors committed Apr 5, 2019
2 parents a11083e + d6b91fe commit a781c47
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 59 files
+15 −2 src/bin/cargo/cli.rs
+12 −6 src/bin/cargo/commands/build.rs
+77 −0 src/bin/cargo/commands/clippy.rs
+47 −17 src/bin/cargo/commands/install.rs
+3 −0 src/bin/cargo/commands/mod.rs
+4 −9 src/cargo/core/compiler/build_config.rs
+5 −1 src/cargo/core/compiler/build_context/mod.rs
+2 −20 src/cargo/core/compiler/compilation.rs
+1 −1 src/cargo/core/compiler/context/compilation_files.rs
+2 −2 src/cargo/core/compiler/context/mod.rs
+7 −7 src/cargo/core/compiler/mod.rs
+50 −4 src/cargo/core/features.rs
+8 −1 src/cargo/core/manifest.rs
+1 −1 src/cargo/core/mod.rs
+46 −4 src/cargo/core/package.rs
+19 −2 src/cargo/core/package_id.rs
+15 −14 src/cargo/core/profiles.rs
+61 −10 src/cargo/core/resolver/conflict_cache.rs
+82 −30 src/cargo/core/resolver/context.rs
+138 −64 src/cargo/core/resolver/mod.rs
+7 −3 src/cargo/core/resolver/types.rs
+4 −1 src/cargo/core/workspace.rs
+5 −15 src/cargo/ops/cargo_doc.rs
+1 −1 src/cargo/ops/cargo_fetch.rs
+1 −1 src/cargo/ops/cargo_install.rs
+8 −2 src/cargo/ops/cargo_new.rs
+13 −26 src/cargo/ops/fix.rs
+2 −2 src/cargo/sources/git/utils.rs
+35 −12 src/cargo/sources/registry/index.rs
+8 −5 src/cargo/util/command_prelude.rs
+8 −9 src/cargo/util/config.rs
+18 −0 src/cargo/util/graph.rs
+1 −1 src/cargo/util/mod.rs
+1 −4 src/cargo/util/process_builder.rs
+8 −4 src/cargo/util/rustc.rs
+11 −0 src/cargo/util/toml/mod.rs
+8 −4 src/doc/man/cargo-build.adoc
+5 −5 src/doc/man/cargo-install.adoc
+8 −4 src/doc/man/generated/cargo-build.html
+5 −5 src/doc/man/generated/cargo-install.html
+17 −9 src/doc/src/appendix/glossary.md
+6 −4 src/doc/src/reference/unstable.md
+16 −6 src/etc/man/cargo-build.1
+7 −7 src/etc/man/cargo-install.1
+1 −1 tests/testsuite/alt_registry.rs
+22 −0 tests/testsuite/bad_config.rs
+76 −8 tests/testsuite/build.rs
+8 −1 tests/testsuite/cargo_features.rs
+0 −2 tests/testsuite/death.rs
+3 −11 tests/testsuite/doc.rs
+69 −4 tests/testsuite/git.rs
+18 −0 tests/testsuite/install.rs
+6 −2 tests/testsuite/member_errors.rs
+11 −0 tests/testsuite/new.rs
+68 −0 tests/testsuite/profile_overrides.rs
+33 −5 tests/testsuite/resolve.rs
+108 −22 tests/testsuite/support/mod.rs
+1 −0 tests/testsuite/support/registry.rs
+3 −0 tests/testsuite/workspaces.rs

0 comments on commit a781c47

Please sign in to comment.