Rollup of 18 pull requests #57690

Centril · 2019-01-17T04:46:59Z

Successful merges:

Remove confusing comment about ideally using ! for c_void #56594 (Remove confusing comment about ideally using ! for c_void)
Move spin_loop_hint to core::hint module #56996 (Move spin_loop_hint to core::hint module)
Optimize try_mark_green and eliminate the lock on dep node colors #57065 (Optimize try_mark_green and eliminate the lock on dep node colors)
Add a regression test for mutating a non-mut #[thread_local] #57107 (Add a regression test for mutating a non-mut #[thread_local])
Make privacy checking, intrinsic checking and liveness checking incremental #57253 (Make privacy checking, intrinsic checking and liveness checking incremental)
Add a target option "merge-functions", and a corresponding -Z flag (works around #57356) #57268 (Add a target option "merge-functions", and a corresponding -Z flag (works around MergeFunctions LLVM pass can generate invalid function calls under calling convention #57356))
Use correct tracking issue for c_variadic #57340 (Use correct tracking issue for c_variadic)
Cleanup PartialEq docs. #57357 (Cleanup PartialEq docs.)
Support passing cflags/cxxflags/ldflags to LLVM build #57370 (Support passing cflags/cxxflags/ldflags to LLVM build)
High priority resolutions for associated variants #57501 (High priority resolutions for associated variants)
resolve: Add a test for issue #57539 #57551 (resolve: Add a test for issue nightly regression: ambiguous import #57539)
Fix nested ? matchers #57610 (Fix nested ? matchers)
use structured macro and path resolve suggestions #57635 (use structured macro and path resolve suggestions)
Fix sources sidebar not showing up #57636 (Fix sources sidebar not showing up)
Fixes text becoming invisible when element targetted #57646 (Fixes text becoming invisible when element targetted)
Add some links in std::fs. #57654 (Add some links in std::fs.)
OSX: fix #57534 registering thread dtors while running thread dtors #57655 (OSX: fix OSX: use after free in thread_local when a TLS location isn't initialized until destruction of another TLS location #57534 registering thread dtors while running thread dtors)
Fix release manifest generation #57659 (Fix release manifest generation)

Failed merges:

Using `!` for `c_void` would have the problem that pointers and potentially references to an uninhabited type would be created, and at least for references this is UB. Also document in addition that newtype wrappers around `c_void` are not recommended for representing opaque types (as a workaround for `extern type` not being stable) but instead refer to the Nomicon.

…rent implementation We need at least two variants of the enum as otherwise the compiler complains about the #[repr(u8)] attribute and we also need at least one variant as otherwise the enum would be uninhabitated and dereferencing pointers to it would be UB. As such, mark the variants not unstable because they should not actually exist but because they are temporary implementation details until `extern type` is stable and can be used instead.

- Cleanup the `impl PartialEq<BookFormat> for Book` implementation - Implement `impl PartialEq<Book> for BookFormat` so it’s symmetric - Fixes rust-lang#53844. - Removes the last example since it appears to be redundant with the previous two examples.

"trampolines", or "aliases (the default)) to allow targets to opt out of the MergeFunctions LLVM pass. Also add a corresponding -Z option with the same name and values. This works around: rust-lang#57356 Motivation: Basically, the problem is that the MergeFunctions pass, which rustc currently enables by default at -O2 and -O3, and `extern "ptx-kernel"` functions (specific to the NVPTX target) are currently not compatible with each other. If the MergeFunctions pass is allowed to run, rustc can generate invalid PTX assembly (i.e. a PTX file that is not accepted by the native PTX assembler ptxas). Therefore we would like a way to opt out of the MergeFunctions pass, which is what our target option does. Related work: The current behavior of rustc is to enable MergeFunctions at -O2 and -O3, and also to enable the use of function aliases within MergeFunctions. MergeFunctions both with and without function aliases is incompatible with the NVPTX target. clang's "solution" is to have a "-fmerge-functions" flag that opts in to the MergeFunctions pass, but it is not enabled by default.

Fixes rust-lang#57306

This may be needed with some host compilers.

…mental

A few items were referenced, but did not have links.

…d dtors

@alexcrichton

…xcrichton Fix release manifest generation r? @alexcrichton

Centril · 2019-01-17T04:47:44Z

@bors r+ p=5

bors · 2019-01-17T04:47:45Z

📌 Commit a9c7eb4 has been approved by Centril

bors · 2019-01-17T13:05:41Z

⌛ Testing commit a9c7eb4 with merge 521a3e5fc95b117d5f63f90ef269bea55b4408dd...

bors · 2019-01-17T16:23:18Z

💔 Test failed - checks-travis

pietroalbini · 2019-01-17T16:23:57Z

@bors retry

Travis time travelled.

bors · 2019-01-17T18:20:25Z

⌛ Testing commit a9c7eb4 with merge 648a58bfa8bc3e22682b24f3c3213301af8633bf...

bors · 2019-01-17T21:47:49Z

💔 Test failed - checks-travis

rust-highfive · 2019-01-17T21:47:51Z

The job dist-x86_64-apple of your PR failed on Travis (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.

[00:03:30] Memory: 8 GB [00:03:30] Boot ROM Version: VMW71.00V.0.B64.1704110547 [00:03:30] Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine [00:03:30] SMC Version (system): 2.8f0 [00:03:30] Serial Number (system): VMDjQxHArha2 [00:03:30] [00:03:30] hw.ncpu: 4 [00:03:30] hw.byteorder: 1234 [00:03:30] hw.memsize: 8589934592 --- [02:50:29] travis_time:end:stage2-cargo-clippy:start=1547761660604020000,finish=1547761661236943000,duration=632923000 [02:50:29] [TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-apple-darwin" }, target: "x86_64-apple-darwin", tool: "cargo-clippy", path: "src/tools/clippy", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: [] } -- 0.662 The job exceeded the maximum time limit for jobs, and has been terminated.

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)

Centril · 2019-01-17T21:51:53Z

@bors retry

bors · 2019-01-18T01:19:45Z

⌛ Testing commit a9c7eb4 with merge 80f340c0079310c705dfd705911d8d0c3f259c51...

bors · 2019-01-18T04:34:21Z

💔 Test failed - checks-travis

rust-highfive · 2019-01-18T04:34:22Z

The job dist-x86_64-apple of your PR failed on Travis (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.

[00:03:27] Memory: 8 GB [00:03:27] Boot ROM Version: VMW71.00V.0.B64.1704110547 [00:03:27] Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine [00:03:27] SMC Version (system): 2.8f0 [00:03:27] Serial Number (system): VMD9AxtwrycD [00:03:27] [00:03:27] hw.ncpu: 4 [00:03:27] hw.byteorder: 1234 [00:03:27] hw.memsize: 8589934592 --- [02:48:57] travis_time:end:stage2-cargo-miri:start=1547785965533123000,finish=1547785966136492000,duration=603369000 [02:48:57] [TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-apple-darwin" }, target: "x86_64-apple-darwin", tool: "cargo-miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: [] } -- 0.635 [02:48:59] [TIMING] Miri { stage: 2, target: "x86_64-apple-darwin" } -- 1.464 The job exceeded the maximum time limit for jobs, and has been terminated.

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)

sdroege and others added 30 commits December 13, 2018 11:07

Cleanup PartialEq docs.

96678df

- Cleanup the `impl PartialEq<BookFormat> for Book` implementation - Implement `impl PartialEq<Book> for BookFormat` so it’s symmetric - Fixes rust-lang#53844. - Removes the last example since it appears to be redundant with the previous two examples.

Fix compile error

0d3dfdf

add missing derive to fix compile error

319a2c1

Update cmp.rs

bbbabdf

Use correct tracking issue for c_variadic

6c60662

Fixes rust-lang#57306

add comment explaining what the derive does

423a5bb

bring back the example i removed, also add symmetry and simplify impl

1445a06

whitespace

0394dce

resolve: Add a test for issue rust-lang#57539

ebdd072

Support passing cflags/cxxflags/ldflags to LLVM build

c663272

This may be needed with some host compilers.

Add a regression test for mutating a non-mut #[thread_local]

f4ded5b

Make privacy checking, intrinsic checking and liveness checking incre…

e459000

…mental

Address comments

e301f90

Optimize try_mark_green and eliminate the lock on dep node colors

8ef7413

Address comments

1313678

use structured macro and path resolve suggestions

93b5536

Fix sources sidebar not showing up

ed717f3

fix nested matchers with ?

6046be4

update/add tests

dabe86d

Move spin_loop_hint to core::hint module

24ca530

Fixes text becoming invisible when element targetted

feda604

update test output

aa1ce32

demonstrate symmetry

32b2834

Add some links in std::fs.

bd8ee51

A few items were referenced, but did not have links.

OSX: fix rust-lang#57534 registering thread dtors while running threa…

1a51bb8

…d dtors

Fix release manifest generation

0772dbb

Prioritize variants as inherent associated items during name resolution

01d0ae9

Rollup merge of rust-lang#57659 - jethrogb:jb/release-manifest, r=ale…

a9c7eb4

…xcrichton Fix release manifest generation r? @alexcrichton

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 17, 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 Jan 17, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 17, 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 Jan 17, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 17, 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 Jan 18, 2019

Centril closed this Jan 18, 2019

Centril deleted the rollup branch January 18, 2019 09:19

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 18 pull requests #57690

Rollup of 18 pull requests #57690

Uh oh!

Centril commented Jan 17, 2019

Centril commented Jan 17, 2019

bors commented Jan 17, 2019

bors commented Jan 17, 2019

bors commented Jan 17, 2019

pietroalbini commented Jan 17, 2019

bors commented Jan 17, 2019

bors commented Jan 17, 2019

rust-highfive commented Jan 17, 2019

Centril commented Jan 17, 2019

bors commented Jan 18, 2019

bors commented Jan 18, 2019

rust-highfive commented Jan 18, 2019

Labels

17 participants

Rollup of 18 pull requests #57690

Rollup of 18 pull requests #57690

Uh oh!

Conversation

Centril commented Jan 17, 2019

Centril commented Jan 17, 2019

bors commented Jan 17, 2019

bors commented Jan 17, 2019

bors commented Jan 17, 2019

pietroalbini commented Jan 17, 2019

bors commented Jan 17, 2019

bors commented Jan 17, 2019

rust-highfive commented Jan 17, 2019

Centril commented Jan 17, 2019

bors commented Jan 18, 2019

bors commented Jan 18, 2019

rust-highfive commented Jan 18, 2019

Labels

17 participants