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

Remove usages of expr_method_call in derive(Ord,PartialOrd,RustcEncode,RustcDecode) #81411

Merged
merged 5 commits into from
Feb 10, 2021
Merged

Remove usages of expr_method_call in derive(Ord,PartialOrd,RustcEncode,RustcDecode) #81411

merged 5 commits into from
Feb 10, 2021

Conversation

Skgland
Copy link
Contributor

@Skgland Skgland commented Jan 26, 2021

Preparing for deprecation of expr_method_call (#81295), by removing the remaining usages not covered by (#81294).

I am not sure about the changes to derive(RustcEncode,RustcDecode)

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2021
@tmiasko
Copy link
Contributor

tmiasko commented Feb 4, 2021

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 4, 2021
@bors
Copy link
Contributor

bors commented Feb 4, 2021

⌛ Trying commit df49341e7bdd092ea25e7ba5efbc0d56674b4680 with merge 1efaba40d3490e0210d6db6d5a7deb774e6f5cbf...

@bors
Copy link
Contributor

bors commented Feb 4, 2021

☀️ Try build successful - checks-actions
Build commit: 1efaba40d3490e0210d6db6d5a7deb774e6f5cbf (1efaba40d3490e0210d6db6d5a7deb774e6f5cbf)

@rust-timer
Copy link
Collaborator

Queued 1efaba40d3490e0210d6db6d5a7deb774e6f5cbf with parent e708cbd, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (1efaba40d3490e0210d6db6d5a7deb774e6f5cbf): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 4, 2021
@tmiasko
Copy link
Contributor

tmiasko commented Feb 4, 2021

Some of benchmarks fail to build with those changes:

error[E0599]: no function or associated item named `emit_struct` found for trait object `dyn Encodable` in the current scope
  --> /.../.cargo/registry/src/github.com-1ecc6299db9ec823/num-bigint-0.1.40/src/biguint.rs:43:48
   |
43 | #[cfg_attr(feature = "rustc-serialize", derive(RustcEncodable, RustcDecodable))]
   |                                                ^^^^^^^^^^^^^^ function or associated item not found in `dyn Encodable`
   |
   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)

@Skgland
Copy link
Contributor Author

Skgland commented Feb 4, 2021

oh, I mixed up the Encodable and Encoder traits in derive(RustcEncodable) in all places where Encoder should have been used. Respectively for RustcDecodable.

@Skgland
Copy link
Contributor Author

Skgland commented Feb 4, 2021

The latest commit should have fixed that now.

@Skgland
Copy link
Contributor Author

Skgland commented Feb 5, 2021

@rustbot label: -S-waiting-on-review +S-waiting-on-author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 5, 2021
@Skgland
Copy link
Contributor Author

Skgland commented Feb 5, 2021

@rustbot label: +S-waiting-on-review -S-waiting-on-author

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 5, 2021
@varkor
Copy link
Member

varkor commented Feb 5, 2021

I'm sorry for taking so long to get to this; the last couple of weeks have been very busy. This looks good to me, though I think we should check performance again now that the issue has been fixed.

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 5, 2021
@bors
Copy link
Contributor

bors commented Feb 5, 2021

⌛ Trying commit 49bd2c39c7499cea0c59102e9fc21739a188c899 with merge 0b541463d2675ae48c07dcd35b4a5a837d494786...

@bors
Copy link
Contributor

bors commented Feb 5, 2021

☀️ Try build successful - checks-actions
Build commit: 0b541463d2675ae48c07dcd35b4a5a837d494786 (0b541463d2675ae48c07dcd35b4a5a837d494786)

@rust-timer
Copy link
Collaborator

Queued 0b541463d2675ae48c07dcd35b4a5a837d494786 with parent f9435f4, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (0b541463d2675ae48c07dcd35b4a5a837d494786): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 5, 2021
@varkor
Copy link
Member

varkor commented Feb 7, 2021

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Feb 7, 2021

📌 Commit 49bd2c39c7499cea0c59102e9fc21739a188c899 has been approved by varkor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2021
@bors
Copy link
Contributor

bors commented Feb 8, 2021

⌛ Testing commit 49bd2c39c7499cea0c59102e9fc21739a188c899 with merge 9593d79927740b22ecd14c10a73b0694ae9a0b27...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 8, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 8, 2021
@Skgland

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 9, 2021

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

@Skgland
Copy link
Contributor Author

Skgland commented Feb 9, 2021

Rebased to fix merge conflicts and ready for review again

@varkor
Copy link
Member

varkor commented Feb 9, 2021

Thanks; sorry, I didn't notice the conflict earlier was spurious.

@bors r+

@bors
Copy link
Contributor

bors commented Feb 9, 2021

📌 Commit 0375022 has been approved by varkor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2021
@bors
Copy link
Contributor

bors commented Feb 10, 2021

⌛ Testing commit 0375022 with merge ca98712...

@bors
Copy link
Contributor

bors commented Feb 10, 2021

☀️ Test successful - checks-actions
Approved by: varkor
Pushing ca98712 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 10, 2021
@bors bors merged commit ca98712 into rust-lang:master Feb 10, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants