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

NLL feature complete (adds `feature(nll)`)! #46862

Merged
merged 39 commits into from Dec 21, 2017

Conversation

Projects
None yet
8 participants
@nikomatsakis
Contributor

nikomatsakis commented Dec 20, 2017

This is the final PR for the nll-master branch; it brings over all remaining content.

The contents of the branch include:

  • track causal information and use it to report extended errors
  • handle impl Trait in NLL code
  • improve printing of outlives errors
  • add #![feature(nll)] and some more sample tests

The commits should for the most part build independently.

r? @pnkfelix (and/or @arielb1)

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Dec 20, 2017

Contributor

☔️ The latest upstream changes (presumably #46733) made this pull request unmergeable. Please resolve the merge conflicts.

Contributor

bors commented Dec 20, 2017

☔️ The latest upstream changes (presumably #46733) made this pull request unmergeable. Please resolve the merge conflicts.

@nikomatsakis nikomatsakis changed the title from Nll 6 to Nll 6 -- feature(nll)! Dec 20, 2017

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Dec 20, 2017

Contributor

☔️ The latest upstream changes (presumably #46874) made this pull request unmergeable. Please resolve the merge conflicts.

Contributor

bors commented Dec 20, 2017

☔️ The latest upstream changes (presumably #46874) made this pull request unmergeable. Please resolve the merge conflicts.

@@ -1075,3 +1114,18 @@ impl<'gcx, 'tcx> ClosureRegionRequirementsExt<'gcx, 'tcx> for ClosureRegionRequi
})
}
}
trait CauseExt {

This comment has been minimized.

@arielb1

arielb1 Dec 20, 2017

Contributor

Why an extension trait? We have to wait until the next snapshot for #![feature(arbitrary_self_types)]

@arielb1

arielb1 Dec 20, 2017

Contributor

Why an extension trait? We have to wait until the next snapshot for #![feature(arbitrary_self_types)]

This comment has been minimized.

@nikomatsakis

nikomatsakis Dec 20, 2017

Contributor

Old habits die hard =)

@nikomatsakis

nikomatsakis Dec 20, 2017

Contributor

Old habits die hard =)

@nikomatsakis nikomatsakis changed the title from Nll 6 -- feature(nll)! to NLL feature complete (adds `feature(nll)`)! Dec 20, 2017

// `mir-opt/nll/liveness-call-subtlety.rs`. To do things
// properly, we would apply the def in call only to the
// input from the success path and not the unwind
// path. -nmatsakis

This comment has been minimized.

@arielb1

arielb1 Dec 20, 2017

Contributor

call leaves garbage in the destination on the unwind path, so the old value of the variable is still irrelevant - i.e. it's still a def.

@arielb1

arielb1 Dec 20, 2017

Contributor

call leaves garbage in the destination on the unwind path, so the old value of the variable is still irrelevant - i.e. it's still a def.

/// appear in the return type).
#[derive(Copy, Clone, Debug)]
pub struct AnonTypeDecl<'tcx> {
/// The substitutions that we apply to the abstract that that this

This comment has been minimized.

@theotherphil

theotherphil Dec 20, 2017

Contributor

Nit: "that that"

@theotherphil

theotherphil Dec 20, 2017

Contributor

Nit: "that that"

@arielb1

This comment has been minimized.

Show comment
Hide comment
@arielb1

arielb1 Dec 20, 2017

Contributor

@bors r+

You could try to fix the comment if you want

Contributor

arielb1 commented Dec 20, 2017

@bors r+

You could try to fix the comment if you want

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Dec 20, 2017

Contributor

📌 Commit d925f4d has been approved by arielb1

Contributor

bors commented Dec 20, 2017

📌 Commit d925f4d has been approved by arielb1

@arielb1

This comment has been minimized.

Show comment
Hide comment
@arielb1

arielb1 Dec 20, 2017

Contributor

@bors p=1

Contributor

arielb1 commented Dec 20, 2017

@bors p=1

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Dec 20, 2017

Contributor

⌛️ Testing commit d925f4d with merge fdfb007...

Contributor

bors commented Dec 20, 2017

⌛️ Testing commit d925f4d with merge fdfb007...

bors added a commit that referenced this pull request Dec 20, 2017

Auto merge of #46862 - nikomatsakis:nll-master, r=arielb1
NLL feature complete (adds `feature(nll)`)!

This is the final PR for the nll-master branch; it brings over all remaining content.

The contents of the branch include:

- track causal information and use it to report extended errors
- handle `impl Trait` in NLL code
- improve printing of outlives errors
- add `#![feature(nll)]` and some more sample tests

The commits should for the most part build independently.

r? @pnkfelix (and/or @arielb1)
@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Dec 21, 2017

Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1
Pushing fdfb007 to master...

Contributor

bors commented Dec 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1
Pushing fdfb007 to master...

@bors bors merged commit d925f4d into rust-lang:master Dec 21, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment