Skip to content

Call str::to_owned in String::from and uninline it #32182

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Mar 13, 2016

Conversation

bluss
Copy link
Member

@bluss bluss commented Mar 10, 2016

Call str::to_owned in String::from and uninline it

These methods were already effectively equal, but now one calls
the other, and neither is marked inline.
String::from does not need to be inlined, it can be without it just like
str::to_owned and String::clone are.

Fixes #32163

@alexcrichton
Copy link
Member

@bors: r+ 2f924980094e85164bb512577a74d3ade8378813

Nice cleanup!

@alexcrichton alexcrichton self-assigned this Mar 11, 2016
@bors
Copy link
Collaborator

bors commented Mar 13, 2016

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

String::from does not need to be inlined, it can be without it just like
str::to_owned and String::clone are.
@bluss bluss force-pushed the string-from-is-str-owned branch from 2f92498 to ec39a76 Compare March 13, 2016 08:39
@bluss
Copy link
Member Author

bluss commented Mar 13, 2016

rebased

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Mar 13, 2016

📌 Commit ec39a76 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Mar 13, 2016

⌛ Testing commit ec39a76 with merge db6dd8e...

bors added a commit that referenced this pull request Mar 13, 2016
Call str::to_owned in String::from and uninline it

Call str::to_owned in String::from and uninline it

These methods were already effectively equal, but now one calls
the other, and neither is marked inline.
String::from does not need to be inlined, it can be without it just like
str::to_owned and String::clone are.

Fixes #32163
@bors bors merged commit ec39a76 into rust-lang:master Mar 13, 2016
@bluss bluss deleted the string-from-is-str-owned branch March 13, 2016 12:44
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants