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

remove mentions of unused [[SourceText]] internal slot; renumber lists #779

Merged
merged 1 commit into from
Feb 2, 2017

Conversation

michaelficarra
Copy link
Member

This slot was added by me to the async function proposal, assuming the Function.prototype.toString rewrite would land first. I'm removing these unused internal slot assignments from the main spec text and will be adding them back in #697 once this is merged. In the process, I've renumbered the lists for easier diffing since they were misnumbered to begin with.

@anba
Copy link
Contributor

anba commented Jan 24, 2017

If this lands before #775, cd1fa44 can be removed in the other PR.

@bterlson
Copy link
Member

You guys just love making merge work don't you.

@michaelficarra
Copy link
Member Author

@anba Oh, great! Sorry for the dupe. I hadn't seen your PR.

@bterlson I'm okay just closing this PR as long as cd1fa44 gets in before the ES2017 cutoff. If something else in #775 is going to block it until after the ES2017 cutoff, please just merge this one.

@bterlson
Copy link
Member

I am going to review #755 before the cutoff.

@michaelficarra I think the step renumbering can stay and doesn't conflict. Maybe remove only the parts duplicated by cd1fa44?

@anba
Copy link
Contributor

anba commented Jan 24, 2017

@michaelficarra I think the step renumbering can stay and doesn't conflict. Maybe remove only the parts duplicated by cd1fa44?

It's probably easier to remove cd1fa44 from #755, isn't it? That way we can avoid merge conflicts in either this PR or the other one.

@bterlson
Copy link
Member

@anba sure seems fine, I can see @michaelficarra right now which is why I thought to ask him to make this apply cleanly on top of #755 but I can prune cd1fa44

@bterlson bterlson merged commit 0b9c4e4 into tc39:master Feb 2, 2017
@michaelficarra michaelficarra deleted the async-function-sourcetext branch February 2, 2017 23:04
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.

3 participants