Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e305df1

Browse files
committedApr 24, 2019
Auto merge of #60180 - ehuss:update-cargo-books, r=alexcrichton
Update cargo, books ## cargo 5 commits in b6581d383ed596b133e330011658c6f83cf85c2f..6be12653dcefb46ee7b605f063ee75b5e6cba513 2019-04-16 16:02:11 +0000 to 2019-04-19 15:05:03 +0000 - Improved docs for `maintenance` options (rust-lang/cargo#6863) - publish-lockfile: Various updates (rust-lang/cargo#6840) - Treat HTTP/2 stream errors as spurious network errors. (rust-lang/cargo#6861) - Validate registry token before operations that require it. (rust-lang/cargo#6854) - Cleanups wrt DYLD_FALLBACK_LIBRARY_PATH handling (rust-lang/cargo#6856) ## reference 2 commits in 98f90ff..2a2de9c 2019-04-06 09:29:08 -0700 to 2019-04-22 10:25:52 -0700 - Remove unused link references. (rust-lang/reference#560) - Fix attribute redirects. (rust-lang/reference#562) ## book 22 commits in b93ec30bbc7b1b5c2f44223249ab359bed2ed5a6..db919bc6bb9071566e9c4f05053672133eaac33e 2019-03-26 16:54:10 -0400 to 2019-04-15 20:11:03 -0400 - Link to chapters mentioned in chapter 12 - Split up a long sentence - Unclear wording 4.3 (rust-lang/book#1907) - Corrected error for array out of bounds (rust-lang/book#1900) - Make lifetime explanation clearer (rust-lang/book#1901) - Replace `T: 'a + Messenger` with `T: Messenger` (rust-lang/book#1831) - Update range so matches rust-fmt . (rust-lang/book#1890) - Adding trailing comma (rust-lang/book#1891) - point 2018 book redirects to existing pages instead of index (rust-lang/book#1919) - Update ch04-03-slices.md (rust-lang/book#1921) - Update link for Russian translation. (rust-lang/book#1915) - Ch7 layout (rust-lang/book#1917) - Update the version of mdbook we use in-tree to match rust-lang/rust (rust-lang/book#1912) - Fix spellingz - Update listings in ch 19-6 for nostarch - Add a high-level overview of the changes in this version of the book - Fix Travis CI badge url (rust-lang/book#1893) - Redo listing numbers in chapter 19 after removals - Remove Advanced Lifetimes section completely - Merge branch 'gh1780' - Merge remote-tracking branch 'origin/master' into gh1567 - remove lifetime subtyping ## rust-by-example 4 commits in f68ef3d0f4959f6a7d92a08d9994b117f0f4d32d..1ff0f8e018838a710ebc0cc1a7bf74ebe73ad9f1 2019-03-12 15:32:12 -0300 to 2019-04-15 08:15:32 -0300 - Fix borrow so it fails in 2018 edition Fixes rust-lang/rust-by-example#1141 (rust-lang/rust-by-example#1152) - Replace lvalue and rvalue with place and value (rust-lang/rust-by-example#1160) - Mutate array in iter_mut() example (rust-lang/rust-by-example#1165) - Fix a typo ("half" -> "halve") (rust-lang/rust-by-example#1172) ## rustc-guide 8 commits in 464cb5b..99e1b1d 2019-03-23 18:39:14 -0500 to 2019-04-20 09:57:54 -0500 - Update BodyId description - Update test-implementation chapter to current code - update chalk with new organization - move to subsection - fix MovePathIndex link - Update query chapter for the query macro rewrite - subchapter with information about `--error-format json` - Update query-evaluation-model-in-detail.md ## edition-guide 1 commits in b56ddb11548450a6df4edd1ed571b2bc304eb9e6..c413d42a207bd082f801ec0137c31b71e4bfed4c 2019-03-10 10:23:16 +0100 to 2019-04-22 01:14:56 +0200 - fix command (rust-lang/edition-guide#155) ## embedded-book 1 commits in 7989c723607ef5b13b57208022259e6c771e11d0..de3d55f521e657863df45260ebbca1b10527f662 2019-04-04 12:14:37 +0000 to 2019-04-22 12:58:28 +0000 - Minor fixes (rust-embedded/book#185) ## nomicon 6 commits in c02e0e7754a76886e55b976a3a4fac20100cd35d..fb29b147be4d9a1f8e24aba753a7e1de537abf61 2019-03-25 16:52:56 -0400 to 2019-04-22 19:10:29 -0400 - Fix link to copy_nonoverlapping (rust-lang/nomicon#134) - Various unchecked-uninit improvements (rust-lang/nomicon#130) - OOM behaviour in `vec-alloc.md` (rust-lang/nomicon#133) - Added missing "things". (rust-lang/nomicon#131) - Fix number agreement in subtyping chapter (rust-lang/nomicon#128) - Minor improvements (rust-lang/nomicon#129)
2 parents bfb443e + 882352a commit e305df1

9 files changed

+27
-26
lines changed
 

‎Cargo.lock

+19-18
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ dependencies = [
250250
"crates-io 0.25.0",
251251
"crossbeam-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
252252
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
253-
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
254-
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
253+
"curl 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
254+
"curl-sys 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
255255
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
256256
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
257257
"filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -540,7 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
540540
name = "crates-io"
541541
version = "0.25.0"
542542
dependencies = [
543-
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
543+
"curl 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
544544
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
545545
"http 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
546546
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -651,29 +651,29 @@ dependencies = [
651651

652652
[[package]]
653653
name = "curl"
654-
version = "0.4.19"
654+
version = "0.4.21"
655655
source = "registry+https://github.com/rust-lang/crates.io-index"
656656
dependencies = [
657-
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
657+
"curl-sys 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
658658
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
659659
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
660660
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
661-
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
661+
"openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)",
662662
"schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
663663
"socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
664664
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
665665
]
666666

667667
[[package]]
668668
name = "curl-sys"
669-
version = "0.4.15"
669+
version = "0.4.18"
670670
source = "registry+https://github.com/rust-lang/crates.io-index"
671671
dependencies = [
672672
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
673673
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
674674
"libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
675675
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
676-
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
676+
"openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)",
677677
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
678678
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
679679
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -999,7 +999,7 @@ dependencies = [
999999
"libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
10001000
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
10011001
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
1002-
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
1002+
"openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)",
10031003
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
10041004
]
10051005

@@ -1008,7 +1008,7 @@ name = "git2-curl"
10081008
version = "0.9.0"
10091009
source = "registry+https://github.com/rust-lang/crates.io-index"
10101010
dependencies = [
1011-
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
1011+
"curl 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
10121012
"git2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
10131013
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
10141014
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1295,11 +1295,11 @@ version = "0.7.11"
12951295
source = "registry+https://github.com/rust-lang/crates.io-index"
12961296
dependencies = [
12971297
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
1298-
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
1298+
"curl-sys 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
12991299
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
13001300
"libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
13011301
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1302-
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
1302+
"openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)",
13031303
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
13041304
]
13051305

@@ -1320,7 +1320,7 @@ dependencies = [
13201320
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
13211321
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
13221322
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1323-
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
1323+
"openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)",
13241324
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
13251325
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
13261326
]
@@ -1715,7 +1715,7 @@ dependencies = [
17151715
"foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
17161716
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
17171717
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
1718-
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
1718+
"openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)",
17191719
]
17201720

17211721
[[package]]
@@ -1733,13 +1733,14 @@ dependencies = [
17331733

17341734
[[package]]
17351735
name = "openssl-sys"
1736-
version = "0.9.40"
1736+
version = "0.9.43"
17371737
source = "registry+https://github.com/rust-lang/crates.io-index"
17381738
dependencies = [
17391739
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
17401740
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
17411741
"openssl-src 111.1.0+1.1.1a (registry+https://github.com/rust-lang/crates.io-index)",
17421742
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
1743+
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
17431744
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
17441745
]
17451746

@@ -4076,8 +4077,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40764077
"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
40774078
"checksum crossbeam-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e07fc155212827475223f0bcfae57e945e694fc90950ddf3f6695bbfd5555c72"
40784079
"checksum crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
4079-
"checksum curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c7c9d851c825e0c033979d4516c9173bc19a78a96eb4d6ae51d4045440eafa16"
4080-
"checksum curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "721c204978be2143fab0a84b708c49d79d1f6100b8785610f456043a90708870"
4080+
"checksum curl 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)" = "a85f2f95f2bd277d316d1aa8a477687ab4a6942258c7db7c89c187534669979c"
4081+
"checksum curl-sys 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)" = "9d91a0052d5b982887d8e829bee0faffc7218ea3c6ebd3d6c2c8f678a93c9a42"
40814082
"checksum datafrog 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a0afaad2b26fa326569eb264b1363e8ae3357618c43982b3f285f0774ce76b69"
40824083
"checksum derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ca414e896ae072546f4d789f452daaecf60ddee4c9df5dc6d5936d769e3d87c"
40834084
"checksum derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871"
@@ -4188,7 +4189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
41884189
"checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9"
41894190
"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
41904191
"checksum openssl-src 111.1.0+1.1.1a (registry+https://github.com/rust-lang/crates.io-index)" = "26bb632127731bf4ac49bf86a5dde12d2ca0918c2234fc39d79d4da2ccbc6da7"
4191-
"checksum openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)" = "1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"
4192+
"checksum openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)" = "33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"
41924193
"checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
41934194
"checksum ordslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd20eec3dbe4376829cb7d80ae6ac45e0a766831dca50202ff2d40db46a8a024"
41944195
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"

‎src/doc/book

Submodule book updated 129 files

‎src/doc/edition-guide

‎src/doc/nomicon

‎src/doc/reference

‎src/doc/rustc-guide

0 commit comments

Comments
 (0)
Please sign in to comment.