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

Fix enum type in std.socket to match the receiver type #7094

Merged
merged 2 commits into from
Jun 27, 2019

Conversation

RazvanN7
Copy link
Collaborator

This currently blocks [1]. The enum is declared as an integer, but it is assigned to ushort variables. This worked due to a bug in dmd which is now being fixed.

[1] dlang/dmd#10099

@dlang-bot
Copy link
Contributor

Thanks for your pull request and interest in making D better, @RazvanN7! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please verify that your PR follows this checklist:

  • My PR is fully covered with tests (you can see the annotated coverage diff directly on GitHub with CodeCov's browser extension
  • My PR is as minimal as possible (smaller, focused PRs are easier to review than big ones)
  • I have provided a detailed rationale explaining my changes
  • New or modified functions have Ddoc comments (with Params: and Returns:)

Please see CONTRIBUTING.md for more information.


If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment.

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub fetch digger
dub run digger -- build "master + phobos#7094"

@@ -729,7 +729,7 @@ public:
private void addPerCall(string f, uint n, names...)(ulong[] values...)
{
import std.array : join;
enum uint mask = mixin("Options."~[names].join("|Options."));
enum ulong mask = mixin("Options."~[names].join("|Options."));
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Assigning ulong to uint.

Copy link
Member

Choose a reason for hiding this comment

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

This is known at compile time, isn't it ? So it should not be a problem.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The idea is that if the user has forced a type upon an enum, it should always be taken into account.

Copy link
Member

Choose a reason for hiding this comment

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

That sounds like a very arbitrary limitation without apparent benefit.

@@ -480,7 +480,7 @@ struct Task(alias fun, Args...)
static if (isFunctionPointer!(_args[0]))
{
private enum bool isPure =
functionAttributes!(Args[0]) & FunctionAttribute.pure_;
(functionAttributes!(Args[0]) & FunctionAttribute.pure_) != 0;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Assigning uint to bool.

@RazvanN7
Copy link
Collaborator Author

I had to fix 2 more cases.

@thewilsonator
Copy link
Contributor

Wait this should target stable.

@RazvanN7
Copy link
Collaborator Author

It is ok to target master. dlang/dmd#10099 cannot target stable.

@dlang-bot dlang-bot merged commit 275f394 into dlang:master Jun 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants