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

Reimplement TokenStreams using ropes #35018

Merged
merged 1 commit into from
Aug 2, 2016
Merged

Conversation

cgswords
Copy link
Contributor

Title says it all; a reimplementation of TokenStreams as ropes.

r? @nrc

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

}


impl clone::Clone for TokenStream {
Copy link
Member

Choose a reason for hiding this comment

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

Why doesn't deriving work? In any case, clone:: is not necessary, Clone is in scope.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just wanted to make sure it did the right thing; it's possible deriving works fine.

Span {
lo: if sp1.lo < sp2.lo { sp1.lo } else { sp2.lo },
hi: if sp1.hi > sp2.hi { sp1.hi } else { sp2.hi
},
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: formatting

@cgswords cgswords force-pushed the rope_tstream branch 3 times, most recently from a215ffc to 43f852c Compare July 29, 2016 17:13
@cgswords
Copy link
Contributor Author

The last bors build is... strange. It's suggesting errors in code that simply doesn't exist. (cc @alexcrichton)

@alexcrichton
Copy link
Member

@cgswords maybe it's some random unit test somewhere? Travis may also get confused if lots of tests are scheduled at once (not sure)

@jseyfried
Copy link
Contributor

jseyfried commented Jul 29, 2016

@cgswords That code exists upstream -- I think Travis is merging with master automatically.
I'd rebase and fix that (implicit) merge conflict.

@cgswords
Copy link
Contributor Author

@jseyfried That's certainly what's happened; I just wasn't expecting it. Thanks!

@jseyfried
Copy link
Contributor

@cgswords no problem!

@nrc
Copy link
Member

nrc commented Aug 1, 2016

@cgswords could you squash the commits please? r=me with that

@nrc
Copy link
Member

nrc commented Aug 1, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 1, 2016

📌 Commit dc259de has been approved by nrc

@bors
Copy link
Contributor

bors commented Aug 2, 2016

⌛ Testing commit dc259de with merge 1ece9ca...

bors added a commit that referenced this pull request Aug 2, 2016
Reimplement TokenStreams using ropes

Title says it all; a reimplementation of TokenStreams as ropes.

r? @nrc
@bors bors merged commit dc259de into rust-lang:master Aug 2, 2016
@cgswords cgswords deleted the rope_tstream branch August 2, 2016 16:26
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.

9 participants