Skip to content

Beta backports #42182

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 6 commits into from
May 24, 2017
Merged

Beta backports #42182

merged 6 commits into from
May 24, 2017

Conversation

nikomatsakis
Copy link
Contributor

@nikomatsakis nikomatsakis commented May 23, 2017 •
edited by brson
Loading

@nikomatsakis
replace the type generalizer with one based on variance
5f41698
@nikomatsakis
add a WF obligation if a type variable appears in bivariant position
c1313f1
@nikomatsakis
correct various error messages that changed
8eb6bdc 
The new messages seem universally better. I think these result because
we recognize that we are in an invariant context more often.
@nikomatsakis
use equality in the coerce-unsized check
087d737 
This seems both to be a safe, conservative choice,
and it sidesteps the cycle in rust-lang#41936.

Fixes rust-lang#41936.
@nikomatsakis
do not fetch variance for items when equating
a30c932 
Fixes rust-lang#41849. Problem was that evaluating the constant expression
required evaluating a trait, which would equate types, which would
request variance information, which it would then discard. However,
computing the variance information would require determining the type of
a field, which would evaluate the constant expression.

(This problem will potentially arise *later* as we move to more sophisticated
constants, however, where we need to check subtyping. We can tackle that
when we come to it.)
@rust-highfive
Copy link
Contributor

r? @pnkfelix

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

@rust-highfive
Copy link
Contributor

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@nikomatsakis
Copy link
Contributor Author

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented May 23, 2017

📌 Commit a30c932 has been approved by nikomatsakis

@arielb1 arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 23, 2017
@bors
Copy link
Collaborator

bors commented May 24, 2017

⌛ Testing commit a30c932 with merge adad643...

@bors
Copy link
Collaborator

bors commented May 24, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented May 24, 2017

Failure in building OpenSSL on macOS.

[01:02:09] stderr ----
[01:02:09] ar: creating archive ../libcrypto.a
[01:02:09] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../libcrypto.a(ebcdic.o) has no symbols
[01:02:09] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../libcrypto.a(fips_ers.o) has no symbols
[01:02:09] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../libcrypto.a(ebcdic.o) has no symbols
[01:02:09] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../libcrypto.a(fips_ers.o) has no symbols
[01:02:09] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: archive member: ../../libcrypto.a(mem.o) size too large (archive member extends past the end of the file)
[01:02:09] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar: internal ranlib command failed
[01:02:09] make[3]: *** [lib] Error 1
[01:02:09] make[2]: *** [subdirs] Error 1
[01:02:09] make[1]: *** [build_crypto] Error 1

@est31
Copy link
Member

est31 commented May 24, 2017

Backport #41563 as well?

let's see where a retry brings us...

@bors retry

@brson
Copy link
Contributor

brson commented May 24, 2017

@bors r+ p=1

I went ahead and backported the simple openssl build fix.

@bors
Copy link
Collaborator

bors commented May 24, 2017

📌 Commit 0566d02 has been approved by brson

@bors
Copy link
Collaborator

bors commented May 24, 2017

⌛ Testing commit 0566d02 with merge 2df18ed...

bors added a commit that referenced this pull request May 24, 2017
@bors
Auto merge of #42182 - nikomatsakis:beta, r=brson
2df18ed 
Beta backports

Backports of:

- #41913 (or some of it)
- #41937
- #41716
- #41563
@bors
Copy link
Collaborator

bors commented May 24, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: brson
Pushing 2df18ed to beta...

@bors bors merged commit 0566d02 into rust-lang:beta May 24, 2017
@nikomatsakis nikomatsakis mentioned this pull request May 25, 2017
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@nikomatsakis @rust-highfive @bors @kennytm @est31 @brson @pnkfelix @arielb1 @aidanhs