Skip to content
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.

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

Rollup of 9 pull requests #64666

Merged
merged 20 commits into from
Sep 22, 2019
Merged

Rollup of 9 pull requests #64666

merged 20 commits into from
Sep 22, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 21, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 20 commits September 18, 2019 17:30
The Windows dist builders are the slowest builders right now, and the
distribution phase of them is enormously slow clocking in at around 20
minutes to build all the related installers. This commit starts to
optimize these by turning down the compression level in the `exe`
installers. These aren't super heavily used so there's no great need for
them to be so ultra-compressed, so let's dial back the compression
parameters to get closer to the rest of our xz archives. This brings the
installer in line with the gz tarball installer locally, and also brings
the compression settings on par with the rest of our xz installers.
This is the same as rust-lang#64615 except applied to our MSI installers. The
same fix is applied effectively bringing these installers in line with
the gz tarball installers, which are about 3x faster to produce locally
and likely much faster to produce on CI.
* Pass `/Q` to `iscc` on Windows to supress the thousands of lines of
  output about compressing documentation.
* Print out what's happening before long steps
* Use `timeit` to print out timing information for long-running
  installer assemblies.
The mentioned Cargo test is fixed in rust-lang/cargo#7210
…-obk

Add explanation to type mismatch involving type params and assoc types

CC rust-lang#63711
…mulacrum

rustbuild: Turn down compression on exe installers

The Windows dist builders are the slowest builders right now, and the
distribution phase of them is enormously slow clocking in at around 20
minutes to build all the related installers. This commit starts to
optimize these by turning down the compression level in the `exe`
installers. These aren't super heavily used so there's no great need for
them to be so ultra-compressed, so let's dial back the compression
parameters to get closer to the rest of our xz archives. This brings the
installer in line with the gz tarball installer locally, and also brings
the compression settings on par with the rest of our xz installers.
…mulacrum

rustbuild: Turn down compression on msi installers

This is the same as rust-lang#64615 except applied to our MSI installers. The
same fix is applied effectively bringing these installers in line with
the gz tarball installers, which are about 3x faster to produce locally
and likely much faster to produce on CI.
…=Mark-Simulacrum

rustbuild: Improve output of `dist` step

* Pass `/Q` to `iscc` on Windows to supress the thousands of lines of
  output about compressing documentation.
* Print out what's happening before long steps
* Use `timeit` to print out timing information for long-running
  installer assemblies.
* Try to scope output of `Dist ...` to not also encompass actual build steps
Fixes rust-lang#63962. Hint about missing tuple parentheses in patterns
Allow using fn pointers in const fn with unleash miri

This allows using function pointers in const fns  when `-Zunleash-the-miri-within-you` is enabled.

If the call to the `const fn` happens in a `const`-context, the function pointer is required to point to a `const fn`:

```rust
fn non_const_fn() -> i32 { 42 }
const fn const_fn() -> i32 { 42 }
const fn foo(x: fn() -> i32) -> i32 { x() }

let x: i32 = foo(non_const_fn_ptr); // OK
let y: i32 = foo(const_fn_ptr); // OK
const X: i32 = foo(non_const_fn_ptr); // ERROR: `non_const_fn` is not `const fn`
const Y: i32 = foo(const_fn_ptr); // OK
```

r? @oli-obk
…ct, r=estebank

unify errors for tuple/struct variants

fix rust-lang#63983
…Simulacrum

fully remove AstBuilder

The mentioned Cargo test is fixed in rust-lang/cargo#7210

I think this can be removed now?
@Centril
Copy link
Contributor Author

Centril commented Sep 21, 2019

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Sep 21, 2019

📌 Commit f0e69ff has been approved by Centril

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

bors commented Sep 22, 2019

⌛ Testing commit f0e69ff with merge ef906d0...

bors added a commit that referenced this pull request Sep 22, 2019
Rollup of 9 pull requests

Successful merges:

 - #63907 (Add explanation to type mismatch involving type params and assoc types)
 - #64615 (rustbuild: Turn down compression on exe installers)
 - #64617 (rustbuild: Turn down compression on msi installers)
 - #64618 (rustbuild: Improve output of `dist` step)
 - #64619 (Fixes #63962. Hint about missing tuple parentheses in patterns)
 - #64634 (Update to LLVM 9.0.0)
 - #64635 (Allow using fn pointers in const fn with unleash miri)
 - #64660 (unify errors for tuple/struct variants)
 - #64664 (fully remove AstBuilder)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 22, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing ef906d0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 22, 2019
@bors bors merged commit f0e69ff into rust-lang:master Sep 22, 2019
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Sep 22, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Sep 22, 2019
@Centril Centril deleted the rollup-tp98vlr branch September 22, 2019 13:24
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hint on missing tuple parens in pattern
8 participants