Skip to content

Port to usize/isize in libsyntax #21340

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Jan 22, 2015
Merged

Port to usize/isize in libsyntax #21340

merged 5 commits into from
Jan 22, 2015

Conversation

pshc
Copy link
Contributor

@pshc pshc commented Jan 18, 2015

Collaboration with @rylev!

I didn't change int in the quasi-quoter, because I'm not sure if there will be adverse effects.

Addresses #21095.

@rust-highfive
Copy link
Contributor

r? @sfackler

(rust_highfive has picked a reviewer for you, use r? to override)

sfackler
sfackler reviewed Jan 18, 2015
View reviewed changes
src/libsyntax/ast.rs
@@ -181,9 +181,9 @@ impl Name {
}
}

pub fn uint(&self) -> uint {
pub fn uint(&self) -> usize {
Copy link
Member

Choose a reason for hiding this comment

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

This should be renamed to usize.

@pshc pshc force-pushed the libsyntax-no-more-ints branch from 63de920 to 3102a87 Compare January 18, 2015 04:48
@pshc
Copy link
Contributor Author

pshc commented Jan 18, 2015

@sfackler Okay, changed and squashed into d5c8365.

@sfackler
Copy link
Member

Thanks!

@pshc
Copy link
Contributor Author

pshc commented Jan 18, 2015

D'oh. Sorry about that. Why didn't my make check pick that failure up? (I wonder what I missed.)

I've pushed 35dd579cb7c5fb0af48bfc89ac2017864eebb548 which I think should fix it, although I'm not 100% on that. Running tests now. Nope, that's still broken. I messed up the spans.

EDIT: It looks like I need to install javac and antlr4 to run this portion of the tests.

@pshc pshc force-pushed the libsyntax-no-more-ints branch from 35dd579 to 7ed0023 Compare January 18, 2015 21:04
@sfackler
Copy link
Member

I don't think you need java and antlr to reach that failure. It looks like it's coming from libsyntax's test, so make check-stage1-syntax should run it for you.

@pshc pshc force-pushed the libsyntax-no-more-ints branch from 7ed0023 to 3c32cd1 Compare January 19, 2015 03:43
@pshc
Copy link
Contributor Author

pshc commented Jan 19, 2015

Yeah, I was pretty confused back there. Okay. I realized that the problem was I had messed with whitespace and therefore the spans of that parse output. So I reverted the whitespace change and fixup'd it into 7a24b3a. Force pushed the rest. Everything should be green now!

@alexcrichton
Copy link
Member

@bors r=sfackler 3c32cd1

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 21, 2015
@alexcrichton
rollup merge of rust-lang#21340: pshc/libsyntax-no-more-ints
0c98187 
Collaboration with @rylev!

I didn't change `int` in the [quasi-quoter](https://github.com/pshc/rust/blob/99ae1a30f3ca28c0f7e431620560d30e44627124/src/libsyntax/ext/quote.rs#L328), because I'm not sure if there will be adverse effects.

Addresses rust-lang#21095.
@bors bors merged commit 3c32cd1 into rust-lang:master Jan 22, 2015
@alexcrichton alexcrichton mentioned this pull request Jan 22, 2015
Closed
@pshc pshc deleted the libsyntax-no-more-ints branch January 25, 2015 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@sfackler sfackler

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@pshc @rust-highfive @sfackler @alexcrichton @bors