Skip to content

Commit

Permalink
Update cargo, books
Browse files Browse the repository at this point in the history
  • Loading branch information
@ehuss
ehuss committed Jan 21, 2020
1 parent ce361fb commit d45d8b1
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
14 changes: 10 additions & 4 deletions Cargo.lock
View file
Expand Up @@ -307,7 +307,7 @@ dependencies = [
"glob",
"hex 0.4.0",
"home",
"humantime",
"humantime 2.0.0",
"ignore",
"im-rc",
"jobserver",
Expand Down Expand Up @@ -1013,7 +1013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
dependencies = [
"atty",
"humantime",
"humantime 1.3.0",
"log",
"regex",
"termcolor",
Expand All @@ -1026,7 +1026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [
"atty",
"humantime",
"humantime 1.3.0",
"log",
"regex",
"termcolor",
Expand Down Expand Up @@ -1454,6 +1454,12 @@ dependencies = [
"quick-error",
]

[[package]]
name = "humantime"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9b6c53306532d3c8e8087b44e6580e10db51a023cf9b433cea2ac38066b92da"

[[package]]
name = "hyper"
version = "0.12.31"
Expand Down Expand Up @@ -2647,7 +2653,7 @@ dependencies = [
"clap",
"derive_more",
"env_logger 0.6.2",
"humantime",
"humantime 1.3.0",
"lazy_static 1.3.0",
"log",
"rls-span",
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 37 files
+1 −1 .travis.yml
+0 −142 2018-edition/Cargo.lock
+0 −36 2018-edition/Cargo.toml
+0 −201 2018-edition/LICENSE-APACHE
+0 −25 2018-edition/LICENSE-MIT
+0 −13 2018-edition/convert-quotes.sh
+0 −24 2018-edition/nostarch.sh
+0 −34 2018-edition/style-guide.md
+0 −218 2018-edition/tools/docx-to-md.xsl
+0 −104 2018-edition/tools/src/bin/concat_chapters.rs
+0 −73 2018-edition/tools/src/bin/convert_quotes.rs
+0 −243 2018-edition/tools/src/bin/lfp.rs
+0 −406 2018-edition/tools/src/bin/link2print.rs
+0 −45 2018-edition/tools/src/bin/remove_links.rs
+0 −52 2018-edition/tools/src/bin/remove_markup.rs
+4 −4 Cargo.toml
+5 −1 README.md
+0 −32 nostarch/updates.md
+0 −142 second-edition/Cargo.lock
+0 −36 second-edition/Cargo.toml
+0 −201 second-edition/LICENSE-APACHE
+0 −25 second-edition/LICENSE-MIT
+0 −13 second-edition/convert-quotes.sh
+0 −20 second-edition/doc-to-md.sh
+0 −24 second-edition/nostarch.sh
+0 −34 second-edition/style-guide.md
+0 −218 second-edition/tools/docx-to-md.xsl
+0 −104 second-edition/tools/src/bin/concat_chapters.rs
+0 −73 second-edition/tools/src/bin/convert_quotes.rs
+0 −242 second-edition/tools/src/bin/lfp.rs
+0 −406 second-edition/tools/src/bin/link2print.rs
+0 −45 second-edition/tools/src/bin/remove_links.rs
+0 −52 second-edition/tools/src/bin/remove_markup.rs
+2 −2 src/appendix-01-keywords.md
+1 −5 src/ch04-02-references-and-borrowing.md
+10 −10 src/ch20-03-graceful-shutdown-and-cleanup.md
+1 −8 tools/src/bin/remove_markup.rs
2 changes: 1 addition & 1 deletion src/doc/embedded-book
Submodule embedded-book updated 1 files
+5 −0 .gitattributes
2 changes: 1 addition & 1 deletion src/doc/reference
Submodule reference updated 3 files
+12 −2 src/items/external-blocks.md
+4 −3 src/type-layout.md
+3 −3 src/types/pointer.md
2 changes: 1 addition & 1 deletion src/doc/rust-by-example
Submodule rust-by-example updated 1 files
+2 −2 src/types/alias.md
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 30 files
+1 −1 Cargo.toml
+1 −1 crates/cargo-test-support/src/lib.rs
+2 −0 src/bin/cargo/commands/owner.rs
+2 −0 src/bin/cargo/commands/publish.rs
+2 −0 src/bin/cargo/commands/yank.rs
+7 −3 src/cargo/core/compiler/build_context/target_info.rs
+1 −1 src/cargo/core/compiler/compilation.rs
+23 −7 src/cargo/core/compiler/context/compilation_files.rs
+1 −1 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/resolver/encode.rs
+1 −1 src/cargo/ops/cargo_compile.rs
+1 −1 src/cargo/ops/cargo_new.rs
+1 −1 src/cargo/ops/common_for_install_and_uninstall.rs
+17 −7 src/cargo/util/config/mod.rs
+1 −1 src/cargo/util/cpu.rs
+2 −2 src/cargo/util/toml/mod.rs
+1 −1 src/doc/man/cargo-bench.adoc
+1 −1 src/doc/man/cargo-test.adoc
+1 −1 src/doc/man/generated/cargo-bench.html
+1 −1 src/doc/man/generated/cargo-test.html
+28 −28 src/doc/src/reference/environment-variables.md
+3 −3 src/etc/man/cargo-bench.1
+3 −3 src/etc/man/cargo-test.1
+26 −0 tests/testsuite/build.rs
+4 −0 tests/testsuite/doc.rs
+3 −23 tests/testsuite/login.rs
+2 −0 tests/testsuite/main.rs
+50 −0 tests/testsuite/owner.rs
+34 −0 tests/testsuite/publish.rs
+38 −0 tests/testsuite/yank.rs

0 comments on commit d45d8b1

Please sign in to comment.