Skip to content

trpl: Proofread "Rust Inside Other Languages" #25464

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 1 commit into from
May 24, 2015
Merged

Conversation

zaeleus
Copy link
Contributor

@zaeleus zaeleus commented May 15, 2015

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @steveklabnik (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. 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 CONTRIBUTING.md for more information.

@zaeleus
Copy link
Contributor Author

zaeleus commented May 15, 2015

I can't seem to add a line comment to unchanged lines, but this is for L140.

That first warning is because we are building a library. If we had a test
for this function, the warning would go away. But for now, it’s never
called.

Is this correct? Adding a test for process() would only affect cargo test, not cargo build.

@bors
Copy link
Collaborator

bors commented May 17, 2015

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

@steveklabnik
Copy link
Member

Hey @zaeleus , thanks for this patch!

I don't know how you made your comments, because they don't show up in the diff tab :/ i'll try to add more inline. also, as @bors mentions, this will need a rebase.

@bors
Copy link
Collaborator

bors commented May 18, 2015

🔒 Merge conflict

@steveklabnik
Copy link
Member

Thank you! I have some nits, but otherwise, this looks great :)

@pnkfelix
Copy link
Member

I'm going to assume that all of the nits have been addressed, since it seems like the commit has been rebased. @steveklabnik , let me know my forthcoming r+ is off-base (given your prior comment).

@pnkfelix
Copy link
Member

@bors r+ 5a1e6df rollup

@bors
Copy link
Collaborator

bors commented May 24, 2015

⌛ Testing commit 5a1e6df with merge 820b1d8...

bors added a commit that referenced this pull request May 24, 2015
@pnkfelix
Copy link
Member

@bors r=steveklabnik

@bors
Copy link
Collaborator

bors commented May 24, 2015

📌 Commit 5a1e6df has been approved by steveklabnik

@steveklabnik
Copy link
Member

@pnkfelix 👍

@bors bors merged commit 5a1e6df into rust-lang:master May 24, 2015
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.

5 participants