Skip to content

Fixed typo and example in the introduction. #22947

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
Mar 6, 2015
Merged

Conversation

ic
Copy link

@ic ic commented Mar 2, 2015

Changed guaranteed for "quaranteed", and
Made failing/working examples look alike.

r? @steveklabnik

@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.

@ic ic changed the title Fixed typo in the introduction. Fixed typo and example in the introduction. Mar 2, 2015
@bors
Copy link
Collaborator

bors commented Mar 2, 2015

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

@alexandercampbell
Copy link
Contributor

@ic I made a PR a couple days ago that fixed the typos in the same paragraph and it was just merged: #22906

Sorry about the conflicts!

@ic
Copy link
Author

ic commented Mar 3, 2015

@alexandercampbell Thanks for the note. It was a tiny typo anyway ;-)

How about the change to the concurrency example? The first time I read the section, I wished for more "connected" examples. Simple edit, and tested on nightly.

@steveklabnik
Copy link
Member

@lc I agree making them more consistent is good, thanks! However, you have a merge commit in here, would you mind rebasing that out? r=me after.

@alexandercampbell
Copy link
Contributor

@ic I like the change you made, but I'm not a maintainer or anything-- #22906 was my first PR

The failing concurrency example was doing something different from the
working example. This commit changes just enough of the failing example
to (1) still fail with the same error, (2) tries to do the same as the
working example (increment a vector value and print it).

r? @steveklabnik
@ic ic force-pushed the master branch 2 times, most recently from 040b60a to dde4e58 Compare March 4, 2015 04:22
@ic
Copy link
Author

ic commented Mar 4, 2015

@steveklabnik Thank you for the feedback. I have set the repository HEAD at the commit. I have also removed the conflicting commit related to @alexandercampbell' s contribution. I chose to proceed this way, as pulling the master from rust-lang/rust refuses to fast-forward right now. I did not investigate much yet. Please let me know as necessary.

@alexandercampbell Ok, thank you. Let's get some more in ;-)

@steveklabnik
Copy link
Member

@bors: r+ dde4e58 rollup

@steveklabnik
Copy link
Member

Looks good, thank you!

Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 5, 2015
 Changed guaranteed for \"quaranteed\", and
Made failing/working examples look alike.

r? @steveklabnik
@bors bors merged commit dde4e58 into rust-lang:master Mar 6, 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