Auto merge of #65457 - tmandry:rollup-y1fd3c6, r=tmandry

Rollup of 2 pull requests Successful merges: - #65445 (Update cargo, cc, books) - #65450 (Update clippy) Failed merges: r? @ghost
rust-lang · Oct 16, 2019 · 6321db3 · 6321db3
2 parents f54911c + 2326eca
commit 6321db3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -379,9 +379,9 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.35"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
+checksum = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
 
 [[package]]
 name = "cfg-if"

diff --git a/src/doc/book b/src/doc/book
diff --git a/src/doc/nomicon b/src/doc/nomicon
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
diff --git a/src/tools/cargo b/src/tools/cargo
diff --git a/src/tools/clippy b/src/tools/clippy
+5 −5		src/appendix-04-useful-development-tools.md
+1 −1		src/appendix-05-editions.md
+1 −1		src/appendix-07-nightly-rust.md
+36 −26		src/ch02-00-guessing-game-tutorial.md
+6 −0		src/ch07-04-bringing-paths-into-scope-with-the-use-keyword.md
+1 −1		src/ch07-05-separating-modules-into-different-files.md
+6 −5		src/ch09-02-recoverable-errors-with-result.md
+6 −6		src/ch10-02-traits.md
+10 −5		src/ch14-03-cargo-workspaces.md
+9 −8		src/ch17-02-trait-objects.md
+2 −2		src/ch18-03-pattern-syntax.md
+3 −3		src/conversion/string.md
+2 −2		src/error/result.md
+2 −2		src/flow_control/match/binding.md
+17 −14		src/fn/closures/input_parameters.md
+1 −1		src/macros/dry.md
+3 −0		src/primitives/array.md
+44 −45		src/scope/borrow/alias.md
+18 −0		crates/resolver-tests/tests/resolve.rs
+0 −1		src/bin/cargo/cli.rs
+0 −1		src/bin/cargo/commands/clippy.rs
+1 −3		src/bin/cargo/main.rs
+8 −16		src/cargo/core/compiler/build_config.rs
+1 −1		src/cargo/core/compiler/build_context/mod.rs
+13 −10		src/cargo/core/compiler/build_context/target_info.rs
+10 −0		src/cargo/core/compiler/context/compilation_files.rs
+1 −4		src/cargo/core/compiler/context/mod.rs
+15 −3		src/cargo/core/compiler/fingerprint.rs
+3 −0		src/cargo/core/compiler/layout.rs
+53 −95		src/cargo/core/compiler/mod.rs
+2 −2		src/cargo/core/compiler/output_depinfo.rs
+0 −2		src/cargo/core/features.rs
+1 −3		src/cargo/core/package.rs
+15 −15		src/cargo/core/profiles.rs
+14 −8		src/cargo/core/resolver/mod.rs
+1 −1		src/cargo/ops/cargo_clean.rs
+37 −36		src/cargo/ops/cargo_new.rs
+5 −7		src/cargo/ops/cargo_package.rs
+2 −2		src/cargo/ops/cargo_test.rs
+1 −1		src/cargo/ops/common_for_install_and_uninstall.rs
+33 −35		src/cargo/ops/registry.rs
+2 −4		src/cargo/sources/git/utils.rs
+1 −1		src/cargo/sources/registry/remote.rs
+26 −10		src/cargo/util/command_prelude.rs
+461 −0		src/cargo/util/config/de.rs
+109 −0		src/cargo/util/config/key.rs
+181 −548		src/cargo/util/config/mod.rs
+35 −0		src/cargo/util/config/path.rs
+202 −0		src/cargo/util/config/value.rs
+1 −1		src/cargo/util/errors.rs
+1 −1		src/cargo/util/network.rs
+54 −23		src/cargo/util/toml/mod.rs
+1 −0		src/doc/man/cargo-package.adoc
+2 −1		src/doc/man/generated/cargo-package.html
+4 −3		src/doc/src/guide/build-cache.md
+2 −0		src/doc/src/reference/config.md
+2 −1		src/doc/src/reference/environment-variables.md
+5 −24		src/doc/src/reference/unstable.md
+4 −3		src/etc/man/cargo-package.1
+2 −2		tests/testsuite/bad_config.rs
+42 −146		tests/testsuite/build.rs
+1 −1		tests/testsuite/build_lib.rs
+4 −4		tests/testsuite/build_script.rs
+86 −92		tests/testsuite/cache_messages.rs
+12 −1		tests/testsuite/check.rs
+3 −3		tests/testsuite/collisions.rs
+17 −13		tests/testsuite/config.rs
+1 −1		tests/testsuite/cross_compile.rs
+69 −0		tests/testsuite/features.rs
+15 −15		tests/testsuite/freshness.rs
+1 −0		tests/testsuite/patch.rs
+11 −11		tests/testsuite/profile_config.rs
+3 −3		tests/testsuite/profile_custom.rs
+65 −24		tests/testsuite/profile_overrides.rs
+6 −6		tests/testsuite/profiles.rs
+81 −0		tests/testsuite/publish.rs
+4 −4		tests/testsuite/run.rs
+14 −14		tests/testsuite/rustc.rs
+2 −0		tests/testsuite/workspaces.rs