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 14 pull requests #44455

Closed
wants to merge 29 commits into from
Closed

Rollup of 14 pull requests #44455

wants to merge 29 commits into from

Conversation

smaeul and others added 29 commits August 28, 2017 11:22
OpenSSL's Configure script is missing a shebang. On some platforms,
execve falls back to execution with the shell. Some other platforms,
like musl, will fail with an exec format error. Avoid this by calling
perl explicitly (since it's a perl script).
Brought up during the discussion of rust-lang#35118, the support for this is still
somewhat buggy and so stabilization likely wants to be considered independently
of the type itself.
NetBSD doesn't ship with sha256sum.  The openssl build will probably
try to use perl anyway, so using perl's shasum is reasonable.
Some tar(1) programs—such as NetBSD's—do not automatically decompress.
As pointed out in rust-lang/libc@deb61c8,
Solaris 10 does not support posix_memalign.
Use memalign for all Solaris versions instead.
With this change applied I am able to cross-build rustc for Solaris 10.
Apparently `dladdr` can succeed but still give you NULL pointers!

Closes rust-lang#44379
Haven't done this in awhile so seems like a good idea!
Explicitly run perl for OpenSSL Configure

OpenSSL's Configure script is missing a shebang. On some platforms,
execve falls back to execution with the shell. Some other platforms,
like musl, will fail with an exec format error. Avoid this by calling
perl explicitly (since it's a perl script).
…atsakis

rustc: Separately feature gate repr(i128)

Brought up during the discussion of rust-lang#35118, the support for this is still
somewhat buggy and so stabilization likely wants to be considered independently
of the type itself.
…lexcrichton

Use rvalue promotion to 'static instead of static items.

Fixes rust-lang#44240. Among other things, in crates that do a lot of formatting, this could reduce the number of items, although I haven't measured the performance benefits. If there's a codegen slowdown, that should IMO be solved by caching the output of miri, *not* by using `static`.

r? @alexcrichton
…d-8c68-1aecbd570fab, r=alexcrichton

Fix extended bootstrap issues with OpenSSL on NetBSD build hosts
Expect pipe symbol after closure parameter list

Fixes rust-lang#44021.

---

Originally, the parser just called `bump` to discard following token after parsing closure parameter list, because it assumes `|` is following. However, the following code breaks the assumption:

```rust
struct MyStruct;
impl MyStruct {
   fn f() {|x, y}
}
```

Here, the parameter list is `x, y` and the following token is `}`. The parser discards `}`, and then we have a curly bracket mismatch.

Indeed, this code has a syntax error. On current nightly, the compiler emits an syntax error, but with incorrect message and span, followed by an ICE.

```
error: expected expression, found `}`
 --> 44021.rs:4:1
  |
4 | }
  | ^

error: internal compiler error: unexpected panic
```

Even worse, on current stable(1.20.0), the compiler falls into an infinite loop.

This pull request fixes this problem. Now the compiler emits correct error message and span, and does not ICE.

```
error: expected one of `:`, `@`, or `|`, found `}`
 --> 44021.rs:3:20
  |
3 |     fn foo() {|x, y}
  |                    ^ expected one of `:`, `@`, or `|` here
```
…ve, r=QuietMisdreavus

Reduce false positives number in rustdoc html diff

cc @rust-lang/dev-tools
r? @nrc

Very simple trick but should lighten html diff a bit
Use memalign instead of posix_memalign for Solaris

As pointed out in rust-lang/libc@deb61c8,
Solaris 10 does not support posix_memalign.
Use memalign for all Solaris versions instead.
With this change applied I am able to cross-build rustc for Solaris 10.
std: Fix a segfault on OSX with backtraces

Apparently `dladdr` can succeed but still give you NULL pointers!

Closes rust-lang#44379
…excrichton

Rotate Travis/AppVeyor S3 keys

Haven't done this in awhile so seems like a good idea!
…ark-Simulacrum

Update the libcompiler_builins submodule

Pulls in rust-lang/compiler-builtins#187 for nicer build output :)
std::thread::LocalKey: Document limitation with initializers

Document that if a `LocalKey`'s initializer recursively depends on itself, initialization will result in infinite recursion.
Fix bitrotted generator panic emission

r? @eddyb
@rust-highfive
Copy link
Collaborator

r? @steveklabnik

(rust_highfive has picked a reviewer for you, use r? to override)

@frewsxcv
Copy link
Member Author

frewsxcv commented Sep 9, 2017

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Sep 9, 2017

📌 Commit 7262b7b has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Sep 9, 2017

⌛ Testing commit 7262b7b with merge dbb3e20e6089d268b4a02f8a5472a4bda38588a9...

@bors
Copy link
Contributor

bors commented Sep 9, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Sep 9, 2017

dist-fuchsia failed to deploy. Probably legit due to #44385.

/home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/seahorse/client/plugins/raise_response_errors.rb:15:in `call': The request signature we calculated does not match the signature you provided. Check your key and signing method. (Aws::S3::Errors::SignatureDoesNotMatch)
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/aws-sdk-core/plugins/s3_sse_cpk.rb:19:in `call'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/aws-sdk-core/plugins/s3_dualstack.rb:24:in `call'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/aws-sdk-core/plugins/s3_accelerate.rb:34:in `call'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/aws-sdk-core/plugins/jsonvalue_converter.rb:20:in `call'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/aws-sdk-core/plugins/idempotency_token.rb:18:in `call'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/aws-sdk-core/plugins/param_converter.rb:20:in `call'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/seahorse/client/plugins/response_target.rb:21:in `call'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/seahorse/client/request.rb:70:in `send_request'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-core-2.10.42/lib/seahorse/client/base.rb:207:in `block (2 levels) in define_operation_methods'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-resources-2.10.42/lib/aws-sdk-resources/services/s3/file_uploader.rb:42:in `block in put_object'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-resources-2.10.42/lib/aws-sdk-resources/services/s3/file_uploader.rb:49:in `open_file'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-resources-2.10.42/lib/aws-sdk-resources/services/s3/file_uploader.rb:41:in `put_object'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-resources-2.10.42/lib/aws-sdk-resources/services/s3/file_uploader.rb:34:in `upload'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/aws-sdk-resources-2.10.42/lib/aws-sdk-resources/services/s3/object.rb:252:in `upload_file'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider/s3.rb:57:in `block (2 levels) in push_app'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider/s3.rb:48:in `glob'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider/s3.rb:48:in `block in push_app'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider/s3.rb:47:in `chdir'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider/s3.rb:47:in `push_app'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider.rb:154:in `block in deploy'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/cli.rb:41:in `fold'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider.rb:154:in `deploy'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/provider/s3.rb:75:in `deploy'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/cli.rb:32:in `run'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/lib/dpl/cli.rb:7:in `run'
	from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.8.42/bin/dpl:5:in `<top (required)>'
	from /home/travis/.rvm/gems/ruby-2.2.7/bin/dpl:23:in `load'
	from /home/travis/.rvm/gems/ruby-2.2.7/bin/dpl:23:in `<main>'
failed to deploy

@frewsxcv frewsxcv closed this Sep 9, 2017
@frewsxcv frewsxcv deleted the rollup branch September 9, 2017 18:38
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.