Skip to content

Rollup of 9 pull requests #56276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

Rollup of 9 pull requests #56276

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b99f9f7
Enclose type in backticks for "non-exhaustive patterns" error
varkor Nov 20, 2018
83388e8
Update an outdated comment in mir building
oli-obk Nov 21, 2018
5a2a251
Update as_temp.rs
oli-obk Nov 21, 2018
925274a
Update as_temp.rs
oli-obk Nov 21, 2018
f039872
Enclose type in backticks for "reached the recursion limit while auto…
varkor Nov 21, 2018
5c99ae6
Fix ICE with feature self_struct_ctor
estebank Nov 25, 2018
8d76f54
Use opt_def_id instead of having special branch
estebank Nov 25, 2018
057e6d3
Add TryFrom<&[T]> for [T; $N] where T: Copy
SimonSapin Nov 25, 2018
2d2b7c0
Make JSON output from -Zprofile-json valid
Mark-Simulacrum Nov 25, 2018
ae0d033
Update cargo
ehuss Nov 25, 2018
cc46685
Remove unsafe `unsafe` inner function.
frewsxcv Nov 26, 2018
cd20be5
Update outdated code comments in StringReader
jasonl Nov 26, 2018
d4a6e73
Use sort_by_cached_key when key the function is not trivial/free
ljedrz Nov 9, 2018
d8ba63f
Rollup merge of #55821 - ljedrz:cached_key_sorts, r=michaelwoerister
kennytm Nov 27, 2018
41232f6
Rollup merge of #56114 - varkor:nonexhaustive-backticks, r=nikomatsakis
kennytm Nov 27, 2018
bb35aad
Rollup merge of #56127 - rust-lang:oli-obk-patch-1, r=nikomatsakis
kennytm Nov 27, 2018
48276a7
Rollup merge of #56205 - estebank:ice-ice-baby, r=nikomatsakis
kennytm Nov 27, 2018
350f314
Rollup merge of #56216 - SimonSapin:array-tryfrom-slice, r=withoutboats
kennytm Nov 27, 2018
8420944
Rollup merge of #56223 - Mark-Simulacrum:self-profile-json, r=wesleyw…
kennytm Nov 27, 2018
5dc0f40
Rollup merge of #56224 - ehuss:update-cargo, r=alexcrichton
kennytm Nov 27, 2018
0e2dc16
Rollup merge of #56236 - frewsxcv:frewsxcv-unsafe-unsafe, r=cramertj
kennytm Nov 27, 2018
76d7daa
Rollup merge of #56255 - jasonl:update-old-documents, r=michaelwoerister
kennytm Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update cargo
  • Loading branch information
@ehuss
ehuss committed Nov 25, 2018
commit ae0d0339e801bc10c46adbeb021b537b8313b760
17 changes: 17 additions & 0 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ dependencies = [
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"home 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ignore 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"im-rc 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -978,6 +979,15 @@ dependencies = [
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "im-rc"
version = "12.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "installer"
version = "0.0.0"
Expand Down Expand Up @@ -3038,6 +3048,11 @@ dependencies = [
"toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "typenum"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "ucd-util"
version = "0.1.1"
Expand Down Expand Up @@ -3331,6 +3346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
"checksum if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec"
"checksum ignore 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3e9faa7c84064f07b40da27044af629f578bc7994b650d3e458d0c29183c1d91"
"checksum im-rc 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4591152fd573cf453a890b5f9fdc5c328a751a0785539316739d5f85e5c468c"
"checksum is-match 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7e5b386aef33a1c677be65237cb9d32c3f3ef56bd035949710c4bb13083eb053"
"checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
Expand Down Expand Up @@ -3482,6 +3498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
"checksum toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a0263c6c02c4db6c8f7681f9fd35e90de799ebd4cfdeab77a38f4ff6b3d8c0d9"
"checksum toml-query 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6854664bfc6df0360c695480836ee90e2d0c965f06db291d10be9344792d43e8"
"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 35 files
+1 −0 Cargo.toml
+21 −12 src/bin/cargo/cli.rs
+2 −1 src/bin/cargo/commands/build.rs
+2 −0 src/bin/cargo/commands/check.rs
+21 −7 src/bin/cargo/commands/mod.rs
+2 −1 src/bin/cargo/commands/run.rs
+2 −1 src/bin/cargo/commands/test.rs
+2 −17 src/bin/cargo/commands/verify_project.rs
+1 −2 src/bin/cargo/main.rs
+20 −0 src/cargo/core/compiler/build_config.rs
+3 −1 src/cargo/core/compiler/build_plan.rs
+9 −0 src/cargo/core/compiler/context/compilation_files.rs
+35 −32 src/cargo/core/compiler/custom_build.rs
+12 −5 src/cargo/core/compiler/layout.rs
+5 −1 src/cargo/core/manifest.rs
+7 −9 src/cargo/core/resolver/context.rs
+30 −16 src/cargo/core/resolver/types.rs
+44 −35 src/cargo/core/source/source_id.rs
+1 −0 src/cargo/lib.rs
+2 −2 src/cargo/ops/resolve.rs
+9 −9 src/cargo/util/command_prelude.rs
+1 −0 src/cargo/util/mod.rs
+6 −1 src/cargo/util/toml/targets.rs
+1 −0 src/doc/src/SUMMARY.md
+178 −0 src/doc/src/appendix/glossary.md
+12 −6 tests/testsuite/build_plan.rs
+44 −22 tests/testsuite/build_script.rs
+25 −20 tests/testsuite/cargo_alias_config.rs
+3 −6 tests/testsuite/cargo_command.rs
+5 −0 tests/testsuite/metabuild.rs
+18 −28 tests/testsuite/plugins.rs
+51 −0 tests/testsuite/run.rs
+4 −2 tests/testsuite/support/mod.rs
+3 −7 tests/testsuite/tool_paths.rs
+24 −0 tests/testsuite/verify_project.rs