Skip to content

Merge head to NNBD branch #2777

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

Merged
merged 28 commits into from
Sep 8, 2021
Merged

Conversation

jcollins-g
Copy link
Contributor

@jcollins-g jcollins-g commented Sep 8, 2021

Only manual bit was adding the dart=2.9 comment to inheritable_container.dart.

* flatten

* Fix up typedef implementation to handle generic non-class correctly

* oops, forgot a bit
…r-extraction

Refactor containers to better reflect current Dart behavior
Forgot to clean up these bits in the markdown renderer
…s+typeparams

Allow embedded type parameters in references
@google-cla google-cla bot added the cla: yes Google CLA check succeeded. label Sep 8, 2021
@jcollins-g jcollins-g marked this pull request as ready for review September 8, 2021 17:38
@jcollins-g jcollins-g requested a review from srawlins September 8, 2021 17:38
@jcollins-g
Copy link
Contributor Author

jcollins-g commented Sep 8, 2021

A PR got merged recently without squash and merge, because there (edit: seemed to be) no way to select landing rules per branch on GitHub (I want merge commits on this branch, but squash and merge on master), and I picked the wrong one by accident. This is why many of the commits don't show the nice "verified" bit.

(edit: I think I might have found a way, now, via branch protection. We'll see if it helps.)

@jcollins-g jcollins-g merged commit ee708e3 into dart-lang:nnbd Sep 8, 2021
@jcollins-g jcollins-g deleted the nnbd-mastermerge-0907 branch September 8, 2021 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Google CLA check succeeded.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants