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.

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

Derive Clone along with Copy on Rust 1.21 #1085

Merged
merged 1 commit into from
Oct 24, 2017

Conversation

pepyakin
Copy link
Contributor

Fixes #934

r? @fitzgen or @emilio

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

Copy link
Member

@fitzgen fitzgen left a comment

Choose a reason for hiding this comment

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

Thanks @pepyakin 👍

derives.push("Clone");
} else {
needs_clone_impl = true;
if used_template_params.is_some() {
Copy link
Member

Choose a reason for hiding this comment

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

Flatten the nested if/else?

if ctx.options().rust_features().builtin_clone_impls() || used_template_params.is_some() {
    ...
} else {
    ...
}

@pepyakin pepyakin force-pushed the builtin-clone-impls branch from e3e0db1 to 1886fe2 Compare October 23, 2017 10:43
@pepyakin
Copy link
Contributor Author

@fitzgen done!

@fitzgen
Copy link
Member

fitzgen commented Oct 23, 2017

@bors-servo r+

@bors-servo
Copy link

📌 Commit 1886fe2 has been approved by fitzgen

@bors-servo
Copy link

🔒 Merge conflict

@bors-servo
Copy link

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

@bors-servo
Copy link

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

@pepyakin pepyakin force-pushed the builtin-clone-impls branch from a84e263 to 2e7d997 Compare October 24, 2017 07:53
@pepyakin
Copy link
Contributor Author

@bors-servo r=fitzgen

@bors-servo
Copy link

📌 Commit 2e7d997 has been approved by fitzgen

@bors-servo
Copy link

⌛ Testing commit 2e7d997 with merge c30a805...

bors-servo pushed a commit that referenced this pull request Oct 24, 2017
Derive `Clone` along with `Copy` on Rust 1.21

Fixes #934

r? @fitzgen or @emilio
@bors-servo
Copy link

☀️ Test successful - status-travis
Approved by: fitzgen
Pushing c30a805 to master...

@bors-servo bors-servo merged commit 2e7d997 into rust-lang:master Oct 24, 2017
@pepyakin pepyakin deleted the builtin-clone-impls branch October 24, 2017 09:36
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.

4 participants