Skip to content

Region inference member constraints #344

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 30 commits into from
Jun 26, 2019
Merged

Region inference member constraints #344

merged 30 commits into from
Jun 26, 2019
+1,022 −471

Conversation

nikomatsakis
Copy link
Contributor

I started working on expanding the chapter on region inference, so as to better document rust-lang/rust#61775. Didn't really get to member constraints yet.

@nikomatsakis nikomatsakis mentioned this pull request Jun 18, 2019
Merged
2 tasks
@mark-i-m
Copy link
Member

@nikomatsakis Are you saying that we should wait for you to push more?

@nikomatsakis
Copy link
Contributor Author

Yes.

@mark-i-m mark-i-m added the S-waiting-on-author Status: this PR is waiting for additional action by the OP label Jun 18, 2019
@nikomatsakis
Copy link
Contributor Author

OK, I pushed a lot more content now.

@nikomatsakis nikomatsakis mentioned this pull request Jun 20, 2019
Closed
3 tasks
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
src/borrow_check/region_inference/constraint_propagation.md
'd: 'c
```

Here we have two SCCs: S0 contains `'a` and `'b`, and S1 contains `'c`
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Here we have two SCCs: S0 contains `'a` and `'b`, and S1 contains `'c`
Here we have two SCCs: `S0` contains `'a` and `'b`, and S1 contains `'c`

lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
lqd
lqd reviewed Jun 20, 2019
View reviewed changes
@lqd
Copy link
Member

lqd commented Jun 20, 2019

wow, these are so good !

mark-i-m
mark-i-m approved these changes Jun 21, 2019
View reviewed changes
Copy link
Member

@mark-i-m mark-i-m left a comment

Choose a reason for hiding this comment

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

Looks great! I was wondering what the SCC stuff was.

There are a bunch of nits/suggestions, but they are mostly typos, minor things.

src/borrow_check/region_inference/error_reporting.md
@@ -0,0 +1,3 @@
# Reporting region errors

TODO: we should discuss how to generate errors from the results of these analyses.
Copy link
Member

Choose a reason for hiding this comment

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

I can actually write a bit here from working on rust-lang/rust#58281

nikomatsakis and others added 24 commits June 24, 2019 14:32
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
8f2f27f 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/lifetime_parameters.md
1f8181c 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/lifetime_parameters.md
addc52b 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/lifetime_parameters.md
bfd8e66 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
78834e5 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
8c6e8ae 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
0863713 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
c6b4f83 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
3ea4723 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
2563350 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/constraint_propagation.md
5f2af11 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/member_constraints.md
3273d19 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/lifetime_parameters.md
7e51cd3 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/member_constraints.md
d7e2823 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/member_constraints.md
35ff1f5 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @mark-i-m
Update src/borrow_check/region_inference/constraint_propagation.md
7d54887 
Co-Authored-By: Who? Me?! <mark-i-m@users.noreply.github.com>
@nikomatsakis @lqd
Update src/borrow_check/region_inference/member_constraints.md
88f13cb 
Co-Authored-By: lqd <remy.rakic+github@gmail.com>
@nikomatsakis @mark-i-m
Update src/borrow_check/region_inference/constraint_propagation.md
c12a025 
Co-Authored-By: Who? Me?! <mark-i-m@users.noreply.github.com>
@nikomatsakis @mark-i-m
Update src/borrow_check/region_inference/member_constraints.md
06548ae 
Co-Authored-By: Who? Me?! <mark-i-m@users.noreply.github.com>
@nikomatsakis @mark-i-m
Update src/borrow_check/region_inference/placeholders_and_universes.md
c44f66f 
Co-Authored-By: Who? Me?! <mark-i-m@users.noreply.github.com>
@nikomatsakis @mark-i-m
Update src/borrow_check/region_inference/placeholders_and_universes.md
1cd4efb 
Co-Authored-By: Who? Me?! <mark-i-m@users.noreply.github.com>
@nikomatsakis @mark-i-m
Update src/borrow_check/region_inference/placeholders_and_universes.md
348e2be 
Co-Authored-By: Who? Me?! <mark-i-m@users.noreply.github.com>
@nikomatsakis
fix indentation
3ecff8c
@nikomatsakis
add point to the glossary and link a use of it
564b1b3
@mark-i-m
Copy link
Member

@nikomatsakis r=me when CI is green. There is one long line (in the ToC, lol):

src/SUMMARY.md
	82 :             - [Placeholders and universes](./borrow_check/region_inference/placeholders_and_universes.md)

@mark-i-m mark-i-m merged commit abf512f into rust-lang:master Jun 26, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@lqd lqd lqd left review comments

@mark-i-m mark-i-m mark-i-m approved these changes

Assignees
No one assigned
Labels
S-waiting-on-author Status: this PR is waiting for additional action by the OP
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nikomatsakis @mark-i-m @lqd