Skip to content

Conversation

jseyfried
Copy link
Contributor

r? @nrc

@bors
Copy link
Collaborator

bors commented Jan 21, 2017

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

@jseyfried jseyfried changed the title [WIP] Refactor TokenStream Refactor TokenStream Jan 22, 2017
@jseyfried jseyfried force-pushed the tokenstream branch 3 times, most recently from eda48d2 to 51b155c Compare January 22, 2017 06:17
@bors
Copy link
Collaborator

bors commented Jan 22, 2017

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

@jseyfried jseyfried force-pushed the tokenstream branch 6 times, most recently from 83b468a to 31417ef Compare January 22, 2017 21:37
@nrc
Copy link
Member

nrc commented Jan 24, 2017

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 24, 2017

📌 Commit 49f5b0a has been approved by nrc

@bors
Copy link
Collaborator

bors commented Jan 24, 2017

⌛ Testing commit 49f5b0a with merge 65b17f5...

bors added a commit that referenced this pull request Jan 24, 2017
@bors
Copy link
Collaborator

bors commented Jan 24, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing 65b17f5 to master...

@bors bors merged commit 49f5b0a into rust-lang:master Jan 24, 2017
@jseyfried jseyfried deleted the tokenstream branch January 24, 2017 23:05
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