Rollup of 7 pull requests by Centril · Pull Request #65670 · rust-lang/rust

Centril · 2019-10-21T19:48:46Z

Successful merges:

Change untagged_unions to not allow union fields with drop #62330 (Change untagged_unions to not allow union fields with drop)
make is_power_of_two a const function #65092 (make is_power_of_two a const function)
Remove src/llvm-emscripten submodule #65501 (Remove src/llvm-emscripten submodule)
miri: add write_bytes method to Memory doing bounds-checks and supporting iterators #65621 (miri: add write_bytes method to Memory doing bounds-checks and supporting iterators)
Remove unnecessary trait bounds and derivations #65647 (Remove unnecessary trait bounds and derivations)
keep the root dir clean from debugging #65653 (keep the root dir clean from debugging)
Fix typo from #65214 #65663 (Fix typo from Split non-CAS atomic support off into target_has_atomic_load_store #65214)

Failed merges:

Rename ConstValue::Infer(InferConst::Canonical(..)) to ConstValue::Bound(..) #65660 (Rename ConstValue::Infer(InferConst::Canonical(..)) to ConstValue::Bound(..))

Union fields may now never have a type with attached destructor. This for example allows unions to use arbitrary field types only by wrapping them in ManuallyDrop. The stable rule remains, that union fields must be Copy. We use the new rule for the `untagged_union` feature. See RFC 2514. Note for ui tests: We can't test move out through Box's deref-move since we can't have a Box in a union anymore.

Cases where it would trigger are now hard errors.

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

…ing iterators

…type

With rust-lang#65251 landed there's no need to build two LLVM backends and ship them with rustc, every target we have now uses the same LLVM backend! This removes the `src/llvm-emscripten` submodule and additionally removes all support from rustbuild for building the emscripten LLVM backend. Multiple codegen backend support is left in place for now, and this is intended to be an easy 10-15 minute win on CI times by avoiding having to build LLVM twice.

… r=RalfJung Change untagged_unions to not allow union fields with drop This is a rebase of rust-lang#56440, massaged to solve merge conflicts and make the test suite pass. Change untagged_unions to not allow union fields with drop Union fields may now never have a type with attached destructor. This for example allows unions to use arbitrary field types only by wrapping them in `ManuallyDrop` (or similar). The stable rule remains, that union fields must be `Copy`. We use the new rule for the `untagged_union` feature. Tracking issue: rust-lang#55149

@oli-obk

make is_power_of_two a const function This makes `is_power_of_two` a const function by using `&` instead of short-circuiting `&&`; Rust supports bitwise `&` for `bool` and short-circuiting is not required in the existing expression. I don't think this needs a const-hack label as I don't find the changed code less readable, if anything I prefer that it is clearer that short circuiting is not used. @oli-obk

…end, r=Mark-Simulacrum Remove `src/llvm-emscripten` submodule With rust-lang#65251 landed there's no need to build two LLVM backends and ship them with rustc, every target we have now uses the same LLVM backend! This removes the `src/llvm-emscripten` submodule and additionally removes all support from rustbuild for building the emscripten LLVM backend. Multiple codegen backend support is left in place for now, and this is intended to be an easy 10-15 minute win on CI times by avoiding having to build LLVM twice.

miri: add write_bytes method to Memory doing bounds-checks and supporting iterators This lets us avoid some direct `Allocation` accesses in Miri.

@nikomatsakis

…r=Centril Remove unnecessary trait bounds and derivations This PR removes unnecessary trait bounds and derivations from many types. r? @nikomatsakis

@ecstatic-morse

…um,Centril keep the root dir clean from debugging We landed this before with rust-lang#63307 but recently in rust-lang#65630 the IMO bad ignore crept back in. If you regularly do graphviz-based debugging and you are fine leaving junk in the rustc root dir, please configure your local `.git/info/exclude`. But most people working on rustc don't work with graphciz all that often (I for once never did), and not everyone likes to have stray generated files in their source dirs. Also Cc rust-lang#63373 rust-lang#53768 @ecstatic-morse @Mark-Simulacrum

Fix typo from rust-lang#65214

Centril · 2019-10-21T19:49:00Z

@bors r+ p=7 rollup=never

bors · 2019-10-21T19:49:01Z

📌 Commit 644228d has been approved by Centril

bors · 2019-10-21T19:49:33Z

⌛ Testing commit 644228d with merge bd60da76a4fed24b0644bfad011b814abc6a4e14...

rust-highfive · 2019-10-21T19:56:36Z

The job dist-various-1 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-10-21T19:55:46.1363364Z   local time: Mon Oct 21 19:55:46 UTC 2019
2019-10-21T19:55:46.1584587Z   network time: Mon, 21 Oct 2019 19:55:46 GMT
2019-10-21T19:55:46.1588933Z == end clock drift check ==
2019-10-21T19:55:46.5532800Z 
2019-10-21T19:55:46.5640009Z ##[error]Bash exited with code '1'.
2019-10-21T19:55:46.5678416Z ##[section]Starting: Upload CPU usage statistics
2019-10-21T19:55:46.5687374Z ==============================================================================
2019-10-21T19:55:46.5687486Z Task         : Bash
2019-10-21T19:55:46.5687609Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-10-21T19:56:49Z

💔 Test failed - checks-azure

tspiteri and others added 30 commits October 4, 2019 11:01

make is_power_of_two a const function

a12788a

Remove uses of allow(unions_with_drop_fields) in the standard library

0a08841

Remove most uses of allow(unions_with_drop_fields) in tests

84ca0a1

Remove unions_with_drop_fields lint

fe13bbd

Cases where it would trigger are now hard errors.

Fixes rust-lang#41073, it is no longer an ICE

e247a40

Update src/librustc_typeck/check/mod.rs

05a644e

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Update src/librustc_typeck/check/mod.rs

8c5ae86

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Update src/librustc_typeck/error_codes.rs

0301eaf

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Update src/test/run-pass/union/union-nodrop.rs

bf25a9c

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

More descriptive variable name

fc512d2

Extend union-nodrop.rs test

616cf52

rpass tests are now part of ui tests

50ec10e

Preserve originally intended test semantics

9c1ad0f

Prefer ManuallyDrop::{take,new} over ptr::{read,write}

2fc257c

Clarify a vague comment

fb23a5c

Ensure we do not treat all unions as not having any drop glue.

7e1a65d

Update ui stderr

f5669eb

Rebase fallout

bb5a652

miri add write_bytes method to Memory doing bounds-checks and support…

5719f57

…ing iterators

also check the iterator is not too long

50ddcbb

Remove unnecessary trait bounds from keys::Keys.

77c50dc

Remove unnecessary Hash bounds from various types.

c3b3a86

Don't silently do nothing on mis_use of check_union_fields

0653694

Report even duplilcate errors in case the feature gat is not active

875bdd5

keep the root dir clean from debugging

55b787e

points the user away from the Allocation type and towards the Memory …

d4b3654

…type

remove write_repeat; it is subsumed by the new write_bytes

f6d70b4

Remove many unnecessary trait derivations.

ac6daed

Fix typo from rust-lang#65214

3de7698

tspiteri and others added 10 commits October 21, 2019 15:35

improve readability of is_power_of_two

d689c70

expand comment

ebc9a1a

Rollup merge of rust-lang#65621 - RalfJung:write_bytes, r=oli-obk

57205dd

miri: add write_bytes method to Memory doing bounds-checks and supporting iterators This lets us avoid some direct `Allocation` accesses in Miri.

Rollup merge of rust-lang#65647 - nnethercote:rm-unnecessary-traits, …

2cf747f

…r=Centril Remove unnecessary trait bounds and derivations This PR removes unnecessary trait bounds and derivations from many types. r? @nikomatsakis

Rollup merge of rust-lang#65663 - Amanieu:typo, r=varkor

644228d

Fix typo from rust-lang#65214

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 21, 2019

Centril added the rollup A PR which is a rollup label Oct 21, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 21, 2019

Centril closed this Oct 21, 2019

Centril deleted the rollup-ydvpvnr branch October 21, 2019 19:59

Centril mentioned this pull request Oct 21, 2019

Remove src/llvm-emscripten submodule #65501

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#65670

Rollup of 7 pull requests#65670
Centril wants to merge 40 commits intorust-lang:masterfrom
Centril:rollup-ydvpvnr

Centril commented Oct 21, 2019

Uh oh!

Centril commented Oct 21, 2019

Uh oh!

bors commented Oct 21, 2019

Uh oh!

bors commented Oct 21, 2019

Uh oh!

rust-highfive commented Oct 21, 2019

Uh oh!

bors commented Oct 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Conversation

Centril commented Oct 21, 2019

Uh oh!

Centril commented Oct 21, 2019

Uh oh!

bors commented Oct 21, 2019

Uh oh!

bors commented Oct 21, 2019

Uh oh!

rust-highfive commented Oct 21, 2019

Uh oh!

bors commented Oct 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants