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

Cleanup some remains of hr_lifetime_in_assoc_type compatibility lint #43543

Merged
merged 1 commit into from
Jul 30, 2017

Conversation

petrochenkov
Copy link
Contributor

Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice.

@@ -6,8 +6,6 @@ error[E0308]: mismatched types
|
= note: expected type `fn(&'cx S) -> &'cx S`
found type `fn(&'a S) -> &S {bar::<'_>}`
= note: lifetime parameter `'b` declared on fn `bar` appears only in the return type, but here is required to be higher-ranked, which means that `'b` must appear in both argument and return types
= note: this error is the result of a recent bug fix; for more information, see issue #33685 <https://github.com/rust-lang/rust/issues/33685>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so I think I kept a lot of that machinery precisely so that we could continue to generate these notes -- or at least the first one -- but it is a lot of "stuff" for a rather obscure corner case.

});
// does not appear in the inputs, but appears in the return type? early-bound.
if !constrained_by_input.regions.contains(&name) &&
appears_in_output.regions.contains(&name) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I prefer the temporary variables; seems easier to read to me, particularly since the body here is indented the same as the condition (in which case I would typically move the { to the next line). But .. whatever. =)

@nikomatsakis
Copy link
Contributor

@bors r+

@alexcrichton
Copy link
Member

@bors: r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jul 29, 2017

📌 Commit 80cf3f9 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Jul 30, 2017

⌛ Testing commit 80cf3f9 with merge 1a5ac0b288c0a3c0d304b84d55b7c5eb44aedbff...

@kennytm
Copy link
Member

kennytm commented Jul 30, 2017

Something's wrong with Travis, each mac jobs is running dozens of workers concurrently, making the mac jobs extremely slow and the time limit extended to at least 30 hours. Since one of the five jobs completed successfully at 4⅗ hours, and the queue is quite empty (2 PRs waiting as of now), let's keep them running for a while.

(I'll cancel it if there are still no progress before 12:00 UTC)

@bors
Copy link
Contributor

bors commented Jul 30, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Jul 30, 2017

@bors retry

macOS builds errored after running for 6.6 hours. Spurious error due to queuing problem on Travis.

@bors
Copy link
Contributor

bors commented Jul 30, 2017

⌛ Testing commit 80cf3f9 with merge 477e9f0...

bors added a commit that referenced this pull request Jul 30, 2017
Cleanup some remains of `hr_lifetime_in_assoc_type` compatibility lint

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Jul 30, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 477e9f0 to master...

@bors bors merged commit 80cf3f9 into rust-lang:master Jul 30, 2017
bors added a commit that referenced this pull request Aug 5, 2017
Fix ICE with elided lifetimes in return type of foreign functions

cc #43567

This is for a preliminary crater/cargobomb run.
Lifetime elision still produces a late-bound lifetime, but it is caught by the same check as catches `type F = for<'a> fn() -> &'a u8` and reported as an error.

If the breakage is significant, I'll have to partially revert #43543 (all the stuff that was required for dealing with late bound lifetimes in this position).

r? @eddyb
bors added a commit that referenced this pull request Aug 16, 2017
Fix ICE with elided lifetimes in return type of foreign functions

cc #43567

This is for a preliminary crater/cargobomb run.
Lifetime elision in foreign functions now works exactly like in other functions or function-like entities.

If the breakage is significant, I'll have to partially revert #43543 (all the stuff that was required for dealing with late bound lifetimes in this position).

r? @eddyb
@petrochenkov petrochenkov deleted the 32330 branch August 26, 2017 00:19
@nikomatsakis nikomatsakis mentioned this pull request Oct 6, 2017
bors added a commit that referenced this pull request Oct 7, 2017
Beta 20170928

Backports of:

- Allow unused extern crate again #44825
- macros: fix bug in collecting trait and impl items with derives. #44757
-  `--cap-lints allow` switches off `can_emit_warnings` #44627
-  Update the libc submodule #44116
- limit and clear cache obligations opportunistically #44269
- clear out projection subobligations after they are processed #43999
-  fix logic error in #44269's `prune_cache_value_obligations` #45065
- REVERTS #43543: Cleanup some remains of `hr_lifetime_in_assoc_type` compatibility lint:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants