Skip to content

Rollup of 17 pull requests #56026

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
kennytm wants to merge 44 commits into from
Closed

Rollup of 17 pull requests #56026

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e753d21
miri: accept extern types in structs if they are the only field
RalfJung Nov 4, 2018
aca76d4
test for offset and alignment of the sized part, instead of field count
RalfJung Nov 4, 2018
bb17f71
also test with PhantomData
RalfJung Nov 4, 2018
5ebd077
make it more obvious that the size is not relevant
RalfJung Nov 5, 2018
a6622c2
note some FIXMEs
RalfJung Nov 5, 2018
ba0bab3
make sure we only guess field alignment at offset 0
RalfJung Nov 6, 2018
b7c319c
do not panic just because cargo failed
RalfJung Nov 11, 2018
0c08529
A few tweaks to iterations/collecting
ljedrz Nov 5, 2018
562be7e
Forward the ABI of the non-zero sized fields of an union if they have…
ogoffart Nov 8, 2018
cfbae3e
core/tests/num: Simplify `test_int_from_str_overflow()` test code
Turbo87 Nov 13, 2018
1ca505a
capture_disjoint_fields(rust-lang#53488)
blitzerr Nov 14, 2018
c040a48
Remove extern and some return value as an attempt to make the test pa…
ogoffart Nov 14, 2018
aa3d7a4
properly calculate spans for intra-doc link resolution errors
QuietMisdreavus Nov 15, 2018
a1f83e7
Stress test for MPSC
stepancheg Nov 15, 2018
6779bb4
capture_disjoint_fields(rust-lang#53488)
blitzerr Nov 15, 2018
c5bc83b
expose MutValueVisitor
RalfJung Nov 13, 2018
e4d03f8
miri value visitor: provide place when visiting a primitive
RalfJung Nov 13, 2018
e6e5635
ty: return impl Iterator from Predicate::walk_tys
ljedrz Nov 14, 2018
8c8ff6a
test/linkage-visibility: Ignore on musl targets
smaeul Sep 16, 2018
764e2a7
Disable some pretty-printers when gdb is rust-enabled
tromey Nov 7, 2018
03aaa4b
remove unused dependency
andjo403 Nov 10, 2018
c1221e2
Replace data.clone() by Arc::clone(&data) in mutex doc.
CBenoit Nov 16, 2018
41434e0
avoid shared ref in UnsafeCell::get
RalfJung Nov 16, 2018
a7b312f
erase the tag on casts involving (raw) pointers
RalfJung Nov 17, 2018
01127ca
Update Cargo submodule
alexcrichton Nov 16, 2018
25d46f3
add comment explaining why what we do is legal
RalfJung Nov 17, 2018
d12de8f
std: Add debugging for a failing test on appveyor
alexcrichton Nov 17, 2018
be2305d
Rollup merge of #55564 - smaeul:test-fixes-2, r=alexcrichton
kennytm Nov 17, 2018
0c5947a
Rollup merge of #55672 - RalfJung:miri-extern-types, r=eddyb
kennytm Nov 17, 2018
f6d9029
Rollup merge of #55767 - tromey:disable-some-pretty-printers, r=nikom…
kennytm Nov 17, 2018
eef30d2
Rollup merge of #55827 - ljedrz:various_stashed, r=alexcrichton
kennytm Nov 17, 2018
7ef5c99
Rollup merge of #55834 - ogoffart:union-abi, r=eddyb
kennytm Nov 17, 2018
3556d98
Rollup merge of #55857 - andjo403:rmdep, r=Mark-Simulacrum
kennytm Nov 17, 2018
95795ca
Rollup merge of #55867 - RalfJung:dont-panic, r=Mark-Simulacrum
kennytm Nov 17, 2018
cf221de
Rollup merge of #55916 - RalfJung:mut-visitor, r=oli-obk
kennytm Nov 17, 2018
08a8076
Rollup merge of #55919 - Turbo87:num-tests, r=dtolnay
kennytm Nov 17, 2018
3fa7798
Rollup merge of #55949 - ljedrz:return_impl_Iterator_from_Predicate_w…
kennytm Nov 17, 2018
1a662d2
Rollup merge of #55953 - blitzerr:master, r=nikomatsakis
kennytm Nov 17, 2018
5f3bf9d
Rollup merge of #55962 - QuietMisdreavus:tricky-spans, r=GuillaumeGomez
kennytm Nov 17, 2018
c3d92b4
Rollup merge of #55963 - stepancheg:mpsc-take-2, r=alexcrichton
kennytm Nov 17, 2018
bc7d2cf
Rollup merge of #55999 - alexcrichton:update-cargo, r=nrc
kennytm Nov 17, 2018
577c360
Rollup merge of #56011 - CBenoit:master, r=QuietMisdreavus
kennytm Nov 17, 2018
a818165
Rollup merge of #56012 - RalfJung:unsafe-cell, r=nikomatsakis
kennytm Nov 17, 2018
db99aa8
Rollup merge of #56017 - alexcrichton:debug-test, r=alexcrichton
kennytm Nov 17, 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
27 changes: 25 additions & 2 deletions src/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crates-io 0.21.0",
"crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -539,6 +539,14 @@ name = "crossbeam-utils"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "crossbeam-utils"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "crypto-hash"
version = "0.3.1"
Expand Down Expand Up @@ -662,6 +670,18 @@ dependencies = [
"termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "env_logger"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "environment"
version = "0.1.1"
Expand Down Expand Up @@ -731,6 +751,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
"miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]

Expand Down Expand Up @@ -3210,6 +3231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum crossbeam-epoch 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c90f1474584f38e270b5b613e898c8c328aa4f3dea85e0a27ac2e642f009416"
"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
"checksum crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c55913cc2799171a550e307918c0a360e8c16004820291bf3b638969b4a01816"
"checksum crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
"checksum curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c7c9d851c825e0c033979d4516c9173bc19a78a96eb4d6ae51d4045440eafa16"
"checksum curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "721c204978be2143fab0a84b708c49d79d1f6100b8785610f456043a90708870"
Expand All @@ -3222,6 +3244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum elasticlunr-rs 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4837d77a1e157489a3933b743fd774ae75074e0e390b2b7f071530048a0d87ee"
"checksum ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dc8393b3c7352f94092497f6b52019643e493b6b890eb417cdb7c46117e621"
"checksum env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f4d7e69c283751083d53d01eac767407343b8b69c4bd70058e08adc2637cb257"
"checksum env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e"
"checksum environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 32 files
+3 −3 Cargo.toml
+1 −1 src/cargo/core/compiler/build_config.rs
+17 −8 src/cargo/core/compiler/context/compilation_files.rs
+88 −21 src/cargo/core/compiler/context/mod.rs
+2 −9 src/cargo/core/compiler/fingerprint.rs
+4 −2 src/cargo/core/compiler/job_queue.rs
+5 −4 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/features.rs
+15 −2 src/cargo/core/manifest.rs
+13 −0 src/cargo/core/package.rs
+3 −4 src/cargo/core/profiles.rs
+117 −38 src/cargo/core/resolver/conflict_cache.rs
+9 −8 src/cargo/core/resolver/context.rs
+2 −2 src/cargo/core/resolver/errors.rs
+4 −4 src/cargo/core/resolver/mod.rs
+9 −11 src/cargo/ops/cargo_compile.rs
+5 −3 src/cargo/ops/fix.rs
+6 −0 src/cargo/ops/registry.rs
+10 −8 src/cargo/util/process_builder.rs
+9 −0 src/crates-io/lib.rs
+62 −2 src/doc/src/reference/specifying-dependencies.md
+0 −55 src/doc/src/reference/unstable.md
+88 −31 tests/testsuite/build.rs
+24 −21 tests/testsuite/check.rs
+105 −0 tests/testsuite/collisions.rs
+71 −0 tests/testsuite/fix.rs
+1 −0 tests/testsuite/main.rs
+31 −0 tests/testsuite/out_dir.rs
+2 −11 tests/testsuite/profile_targets.rs
+6 −94 tests/testsuite/rename_deps.rs
+37 −10 tests/testsuite/resolve.rs
+0 −4 tests/testsuite/rustc.rs
2 changes: 2 additions & 0 deletions src/tools/tidy/src/deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const WHITELIST: &[Crate] = &[
Crate("kernel32-sys"),
Crate("lazy_static"),
Crate("libc"),
Crate("libz-sys"),
Crate("lock_api"),
Crate("log"),
Crate("log_settings"),
Expand Down Expand Up @@ -133,6 +134,7 @@ const WHITELIST: &[Crate] = &[
Crate("utf8-ranges"),
Crate("version_check"),
Crate("void"),
Crate("vcpkg"),
Crate("winapi"),
Crate("winapi-build"),
Crate("winapi-i686-pc-windows-gnu"),
Expand Down