Skip to content

Commit

Permalink
Rollup merge of rust-lang#65445 - ehuss:update-cargo-books, r=alexcri…
Browse files Browse the repository at this point in the history 
…chton

Update cargo, cc, books

Update `cc` to include new parallel building support.

## nomicon

3 commits in 4374786f0b4bf0606b35d5c30a9681f342e5707b..5004ad30d69f93553ceef74439fea2159d1f769e
2019-09-17 18:33:21 +0200 to 2019-10-12 19:52:40 +0200
- further clarify C11 and C/C++11 terminology (rust-lang/nomicon#169)
- atomics: C11 -> C++20 (rust-lang/nomicon#168)
- use sound/unsound terminology

## cargo

12 commits in a429e8cc4614a46a86322a0777a477e2baa83f1c..3a9abe3f065554a7fbc59f440df2baba4a6e47ee
2019-10-04 17:36:12 +0000 to 2019-10-15 15:55:35 +0000
- Fix typo in git index initialization error path (rust-lang/cargo#7512)
- Reject feature flags in a virtual workspace. (rust-lang/cargo#7507)
- Rename `overrides` to `package` in profiles. (rust-lang/cargo#7504)
- Allow publishing with dev-dependencies without a version. (rust-lang/cargo#7333)
- Stabilize cache-messages (rust-lang/cargo#7450)
- don't lock the package cache when cleaning target dir. (rust-lang/cargo#7502)
- Document rustc wrapper (rust-lang/cargo#7499)
- Migrate towards exclusively using serde for `Config` (rust-lang/cargo#7456)
- Re-enable some MSVC tests. (rust-lang/cargo#7492)
- when -Z unstable-options not specified, don't validate --profile (rust-lang/cargo#7489)
- Improve error message for cyclic dependencies (rust-lang/cargo#7470)
- Some minor clippy fixes. (rust-lang/cargo#7484)

## book

7 commits in 04806c80be0f54b1290287e3f85e84bdfc0b6ec7..9bb8b161963fcebc9d9ccd732ba26f42108016d5
2019-10-01 20:20:22 -0400 to 2019-10-14 18:42:55 -0500
- Make a portion of text less ambiguous (rust-lang/book#2092)
- fix heading level (rust-lang/book#2117)
- Add missing "of" before `"duck typing"`. (rust-lang/book#1951)
- ch18-03: no need to debug print destructured int (rust-lang/book#1991)
- Subtle fix to introduce ? on Option in Chapter 9.2 (rust-lang/book#2047)
- make wording clearer (rust-lang/book#1976)
- Update the version of rand we use

## rust-by-example

5 commits in a6288e7407a6c4c19ea29de6d43f40c803883f21..0b111eaae36cc4b4997684be853882a59e2c7ca7
2019-10-01 10:09:14 -0300 to 2019-10-14 18:34:25 -0300
- Some fix to three files (rust-lang/rust-by-example#1280)
- Add reference to Generics (rust-lang/rust-by-example#1281)
- Confusing and long sentence (rust-lang/rust-by-example#1282)
- Explicit mention of slice range meaning (rust-lang/rust-by-example#1277)
- Updated aliasing for nll (rust-lang/rust-by-example#1276)
  • Loading branch information
@tmandry
tmandry committed Oct 16, 2019
2 parents f54911c + 611bdcc commit 9a7166b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 11 files
+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
2 changes: 1 addition & 1 deletion src/doc/nomicon
Submodule nomicon updated from 437478 to 5004ad
2 changes: 1 addition & 1 deletion src/doc/rust-by-example
Submodule rust-by-example updated 7 files
+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
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 61 files
+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

0 comments on commit 9a7166b

Please sign in to comment.