Skip to content

Commit

Permalink
Auto merge of #44259 - Mark-Simulacrum:update-cargo, r=alexcrichton
Browse files Browse the repository at this point in the history 
Update cargo

This includes rust-lang/cargo#4447 which fixes a bug in Cargo that is needed to fix #44237.

r? @alexcrichton
  • Loading branch information
@bors
bors committed Sep 2, 2017
2 parents cc1fc88 + 1b758fb commit 8d83c15
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 61 files
+3 −1 .travis.yml
+3 −0 src/bin/package.rs
+4 −0 src/bin/publish.rs
+2 −1 src/cargo/ops/cargo_package.rs
+6 −6 src/cargo/ops/cargo_rustc/compilation.rs
+1 −1 src/cargo/ops/cargo_rustc/context.rs
+7 −0 src/cargo/ops/cargo_test.rs
+2 −0 src/cargo/ops/registry.rs
+5 −0 src/cargo/util/process_builder.rs
+5 −0 src/ci/dox.sh
+13 −0 src/doc/MIGRATION_MAP
+6 −0 src/doc/README.md
+1 −0 src/doc/book/.gitignore
+47 −0 src/doc/book/README.md
+2 −0 src/doc/book/book.toml
+31 −0 src/doc/book/src/SUMMARY.md
+193 −0 src/doc/book/src/faq.md
+ − src/doc/book/src/favicon.ico
+6 −0 src/doc/book/src/getting-started.md
+70 −0 src/doc/book/src/getting-started/first-steps.md
+38 −0 src/doc/book/src/getting-started/installation.md
+13 −0 src/doc/book/src/guide.md
+103 −0 src/doc/book/src/guide/cargo-toml-vs-cargo-lock.md
+21 −0 src/doc/book/src/guide/continuous-integration.md
+89 −0 src/doc/book/src/guide/creating-a-new-project.md
+90 −0 src/doc/book/src/guide/dependencies.md
+35 −0 src/doc/book/src/guide/project-layout.md
+39 −0 src/doc/book/src/guide/tests.md
+12 −0 src/doc/book/src/guide/why-cargo-exists.md
+22 −0 src/doc/book/src/guide/working-on-an-existing-project.md
+ − src/doc/book/src/images/Cargo-Logo-Small.png
+ − src/doc/book/src/images/auth-level-acl.png
+ − src/doc/book/src/images/org-level-acl.png
+28 −0 src/doc/book/src/introduction.md
+17 −0 src/doc/book/src/reference.md
+556 −0 src/doc/book/src/reference/build-scripts.md
+137 −0 src/doc/book/src/reference/config.md
+130 −0 src/doc/book/src/reference/environment-variables.md
+102 −0 src/doc/book/src/reference/external-tools.md
+756 −0 src/doc/book/src/reference/manifest.md
+44 −0 src/doc/book/src/reference/pkgid-spec.md
+70 −0 src/doc/book/src/reference/policies.md
+222 −0 src/doc/book/src/reference/publishing.md
+128 −0 src/doc/book/src/reference/source-replacement.md
+526 −0 src/doc/book/src/reference/specifying-dependencies.md
+6 −3 src/doc/build-script.md
+3 −4 src/doc/crates-io.md
+0 −1 src/doc/external-tools.md
+59 −54 src/doc/guide.md
+38 −15 src/doc/index.md
+5 −6 src/doc/manifest.md
+2 −3 src/doc/policies.md
+3 −3 src/doc/specifying-dependencies.md
+130 −0 tests/cargotest/support/cross_compile.rs
+2 −0 tests/cargotest/support/mod.rs
+30 −0 tests/cargotest/support/publish.rs
+51 −180 tests/cross-compile.rs
+100 −0 tests/cross-publish.rs
+36 −62 tests/publish.rs
+7 −7 tests/rustdoc.rs
+56 −1 tests/test.rs

0 comments on commit 8d83c15

Please sign in to comment.