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.

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

Add a test for AddAssign on String #35049

Merged
merged 1 commit into from Jul 30, 2016
Merged

Add a test for AddAssign on String #35049

merged 1 commit into from Jul 30, 2016

Conversation

knight42
Copy link
Contributor

Fix #35047

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

@knight42
Copy link
Contributor Author

@aturon I guess the failure is irrelated to my patch. Maybe run the tests again?

durka
durka reviewed Jul 27, 2016
View reviewed changes
src/libcollectionstest/string.rs
@@ -192,6 +192,18 @@ fn test_push_str() {
assert_eq!(&s[0..], "abcประเทศไทย中华Việt Nam");
}

#[cfg(feature = "stringaddassign")]
Copy link
Contributor

Choose a reason for hiding this comment

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

why the cfg?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed now

@knight42
Copy link
Contributor Author

Could this be merged now?

@aturon
Copy link
Member

aturon commented Jul 28, 2016

Looks great, thanks!

@bors: r+ rollup

@durka
Copy link
Contributor

durka commented Jul 29, 2016

bors somehow didn't hear that?

@knight42
Copy link
Contributor Author

Perhaps we need retry?

@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jul 29, 2016

📌 Commit 6ac83de has been approved by alexcrichton

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jul 30, 2016
@steveklabnik
Rollup merge of rust-lang#35049 - knight42:add-test, r=alexcrichton
bb01409 
Add a test for AddAssign on String

Fix rust-lang#35047
@steveklabnik steveklabnik mentioned this pull request Jul 30, 2016
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 30, 2016
@Manishearth
Rollup merge of rust-lang#35049 - knight42:add-test, r=alexcrichton
96e3972 
Add a test for AddAssign on String

Fix rust-lang#35047
@Manishearth Manishearth mentioned this pull request Jul 30, 2016
Merged
bors added a commit that referenced this pull request Jul 30, 2016
@bors
Auto merge of #35127 - Manishearth:rollup, r=Manishearth
ffcbd2d 
Rollup of 8 pull requests

- Successful merges: #35049, #35058, #35063, #35080, #35090, #35094, #35104, #35106
- Failed merges:
@bors bors merged commit 6ac83de into rust-lang:master Jul 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@knight42 @rust-highfive @aturon @durka @alexcrichton @bors