Skip to content

Fix Issue 18299: std.datetime.date.cmpTimeUnits does not throw a Date… #6068

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

Merged
dlang-bot merged 1 commit into from
Jan 26, 2018
Merged

Fix Issue 18299: std.datetime.date.cmpTimeUnits does not throw a Date… #6068

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions std/datetime/date.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9986,12 +9986,11 @@ int cmpTimeUnits(string lhs, string rhs) @safe pure
import std.exception : enforce;
import std.format : format;

auto tstrings = timeStrings;
immutable indexOfLHS = countUntil(tstrings, lhs);
immutable indexOfRHS = countUntil(tstrings, rhs);
immutable indexOfLHS = countUntil(timeStrings, lhs);
immutable indexOfRHS = countUntil(timeStrings, rhs);
Copy link
Member

@quickfur quickfur Jan 25, 2018

Choose a reason for hiding this comment

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

Just curious, what was the reason for this change?

Copy link
Contributor Author

@JackStouffer JackStouffer Jan 25, 2018

Choose a reason for hiding this comment

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

No reason to make a second copy of the reference when countUntil takes it by value

Copy link
Member

@quickfur quickfur Jan 25, 2018

Choose a reason for hiding this comment

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

Fair enough.


enforce(indexOfLHS != -1, format("%s is not a valid TimeString", lhs));
enforce(indexOfRHS != -1, format("%s is not a valid TimeString", rhs));
enforce!DateTimeException(indexOfLHS != -1, format("%s is not a valid TimeString", lhs));
enforce!DateTimeException(indexOfRHS != -1, format("%s is not a valid TimeString", rhs));

if (indexOfLHS < indexOfRHS)
return -1;
Expand All @@ -10004,9 +10003,13 @@ int cmpTimeUnits(string lhs, string rhs) @safe pure
///
@safe pure unittest
{
import std.exception : assertThrown;

assert(cmpTimeUnits("hours", "hours") == 0);
assert(cmpTimeUnits("hours", "weeks") < 0);
assert(cmpTimeUnits("months", "seconds") > 0);

assertThrown!DateTimeException(cmpTimeUnits("month", "second"));
}

@safe unittest
Expand Down