Skip to content

Rollup of 13 pull requests #56422

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
Centril wants to merge 34 commits into from
Closed

Rollup of 13 pull requests #56422

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ae0d033
Update cargo
ehuss Nov 25, 2018
c4e0b89
move stage0.txt to toplevel directory
Keruspe Nov 24, 2018
c343bbd
update miri
RalfJung Nov 28, 2018
682f0f8
Consider references and unions potentially inhabited during privacy-r…
varkor Nov 20, 2018
d2b3407
Add a test for uninhabitedness changes
varkor Nov 20, 2018
32a8dec
Clarify undecided semantics
varkor Nov 20, 2018
46ef9f8
Fix broken tests
varkor Nov 20, 2018
1cdf5df
Fix error message after rebase
varkor Nov 29, 2018
113ae0f
update miri
RalfJung Nov 30, 2018
1560a75
Refer to the second borrow as the "second borrow".
wildarch Nov 30, 2018
aa5a4ef
Removed feature gate.
alexreg Nov 30, 2018
7bc1255
Removed chapter from Unstable Book.
alexreg Nov 30, 2018
d609fdf
Updated ui tests.
alexreg Nov 30, 2018
f107514
Deal with EINTR in net timeout tests
cuviper Nov 30, 2018
f4cde5b
stabilize std::dbg!(...)
Centril Dec 1, 2018
4c2c523
Move VecDeque::resize_with out of the impl<T:Clone> block
scottmcm Dec 1, 2018
a3b7a21
Improve the unstable book example for `#[marker]`
scottmcm Dec 1, 2018
610dcb4
rustbuild: properly dist stage0.txt
Keruspe Dec 1, 2018
08a6cf3
Remove unneeded body class selector
GuillaumeGomez Dec 1, 2018
12c9b79
Fix failing tidy (line endings on Windows)
petrochenkov Dec 1, 2018
e7e9692
remove some uses of try!
mark-i-m Dec 1, 2018
9765fc3
Rollup merge of #56110 - varkor:inhabitedness-union-enum, r=cramertj
Centril Dec 1, 2018
c822963
Rollup merge of #56224 - ehuss:update-cargo, r=alexcrichton
Centril Dec 1, 2018
3b49529
Rollup merge of #56285 - Keruspe:stage0, r=alexcrichton
Centril Dec 1, 2018
e19a94d
Rollup merge of #56305 - RalfJung:miri, r=oli-obk
Centril Dec 1, 2018
4cebd21
Rollup merge of #56366 - alexreg:stabilise-self_in_typedefs, r=Centril
Centril Dec 1, 2018
4737a86
Rollup merge of #56372 - wildarch:issue-55314-second-borrow-ref, r=da…
Centril Dec 1, 2018
22e5375
Rollup merge of #56394 - cuviper:interrupted-timeout, r=sfackler
Centril Dec 1, 2018
38d52d6
Rollup merge of #56395 - Centril:stabilize-dbg-macro, r=SimonSapin
Centril Dec 1, 2018
bb12036
Rollup merge of #56401 - scottmcm:vecdeque-resize-with, r=dtolnay
Centril Dec 1, 2018
2edc3c1
Rollup merge of #56402 - scottmcm:better-marker-trait-example, r=Centril
Centril Dec 1, 2018
ba05902
Rollup merge of #56416 - GuillaumeGomez:css-body, r=QuietMisdreavus
Centril Dec 1, 2018
9b574ce
Rollup merge of #56418 - petrochenkov:wintidy, r=nagisa
Centril Dec 1, 2018
874af23
Rollup merge of #56419 - mark-i-m:remove-try, r=Centril
Centril Dec 1, 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
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 @@ -3030,6 +3040,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 @@ -3323,6 +3338,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 @@ -3474,6 +3490,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