Skip to content

Commit 5dc0f40

Browse files
authored
Rollup merge of rust-lang#56224 - ehuss:update-cargo, r=alexcrichton
Update cargo 14 commits in b3d0b2e545b61d4cd08096911724b7d49d213f73..1ff5975b96b3d395bb962394596998dfb485f793 2018-11-15 19:13:04 +0000 to 2018-11-25 14:59:12 +0000 - Intern SourceId (rust-lang/cargo#6342) - Tweak Layout to allow for non json file targets with internal "." (rust-lang/cargo#6255) - Correct Target Directory command-line option (rust-lang/cargo#6343) - Persistent data structures by im-rs (rust-lang/cargo#6336) - Move command prelude into main library (rust-lang/cargo#6335) - Distinguish custom build invocations (rust-lang/cargo#6331) - Allow crate_type=bin examples to run (rust-lang/cargo#6330) - Make verify-project honour unstable features (rust-lang/cargo#6326) - Make autodiscovery disable inferred targets (rust-lang/cargo#6329) - Add `c` alias for `check` (rust-lang/cargo#6218) - Allow user aliases to override built-in aliases (rust-lang/cargo#6259) - Fix renaming directory project using build scripts with cross-compiling. (rust-lang/cargo#6328) - Fix add_plugin_deps-related tests. (rust-lang/cargo#6327) - Add a glossary. (rust-lang/cargo#6321)
2 parents 8420944 + ae0d033 commit 5dc0f40

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

Cargo.lock

+17
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ dependencies = [
201201
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
202202
"home 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
203203
"ignore 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
204+
"im-rc 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
204205
"jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
205206
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
206207
"lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -978,6 +979,15 @@ dependencies = [
978979
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
979980
]
980981

982+
[[package]]
983+
name = "im-rc"
984+
version = "12.2.0"
985+
source = "registry+https://github.com/rust-lang/crates.io-index"
986+
dependencies = [
987+
"rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
988+
"typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
989+
]
990+
981991
[[package]]
982992
name = "installer"
983993
version = "0.0.0"
@@ -3038,6 +3048,11 @@ dependencies = [
30383048
"toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
30393049
]
30403050

3051+
[[package]]
3052+
name = "typenum"
3053+
version = "1.10.0"
3054+
source = "registry+https://github.com/rust-lang/crates.io-index"
3055+
30413056
[[package]]
30423057
name = "ucd-util"
30433058
version = "0.1.1"
@@ -3331,6 +3346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33313346
"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
33323347
"checksum if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec"
33333348
"checksum ignore 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3e9faa7c84064f07b40da27044af629f578bc7994b650d3e458d0c29183c1d91"
3349+
"checksum im-rc 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4591152fd573cf453a890b5f9fdc5c328a751a0785539316739d5f85e5c468c"
33343350
"checksum is-match 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7e5b386aef33a1c677be65237cb9d32c3f3ef56bd035949710c4bb13083eb053"
33353351
"checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
33363352
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
@@ -3482,6 +3498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
34823498
"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
34833499
"checksum toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a0263c6c02c4db6c8f7681f9fd35e90de799ebd4cfdeab77a38f4ff6b3d8c0d9"
34843500
"checksum toml-query 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6854664bfc6df0360c695480836ee90e2d0c965f06db291d10be9344792d43e8"
3501+
"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
34853502
"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
34863503
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
34873504
"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"

0 commit comments

Comments
 (0)