Skip to content

Commit 94bf2c1

Browse files
committedDec 24, 2018
Auto merge of #57087 - Centril:rollup, r=Centril
Rollup of 14 pull requests Successful merges: - #56188 (enum type instead of variant suggestion unification ) - #56342 (Improve docs for collecting into `Option`s) - #56916 (Fix mutable references in `static mut`) - #56917 (Simplify MIR generation for logical operations) - #56939 (Pin stabilization) - #56953 (Mark tuple structs as live if their constructors are used) - #56964 (Remove `TokenStream::JointTree`.) - #56966 (Correct strings for raw pointer deref and array access suggestions) - #57020 (Point to cause of `fn` expected return type) - #57032 (fix deprecation warnings in liballoc benches) - #57053 (Fix alignment for array indexing) - #57062 (Fix a comment) - #57067 (Stabilize min_const_unsafe_fn in 1.33) - #57078 (Ignore two tests on s390x) Failed merges: r? @ghost
2 parents e169280 + dff3e41 commit 94bf2c1

File tree

79 files changed

+721
-489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+721
-489
lines changed
 

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dependencies = [
1818
"compiler_builtins 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
1919
"core 0.0.0",
2020
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
21+
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
2122
]
2223

2324
[[package]]

‎src/liballoc/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }
1515

1616
[dev-dependencies]
1717
rand = "0.6"
18+
rand_xorshift = "0.1"
1819

1920
[[test]]
2021
name = "collectionstests"

0 commit comments

Comments
 (0)
Please sign in to comment.