Skip to content

Commit 8f71f21

Browse files
authored
revert 57 (#83)
1 parent 11bc340 commit 8f71f21

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
lines changed

Diff for: Project.toml

-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ version = "0.5.4"
44

55
[deps]
66
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
7-
EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949"
87
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
98

109
[compat]
11-
EllipsisNotation = "0.4, 1.0"
1210
julia = "0.7, 1"
1311

1412
[extras]

Diff for: src/IntervalSets.jl

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ import Statistics: mean
99

1010
using Dates
1111

12-
using EllipsisNotation
13-
import EllipsisNotation: Ellipsis
14-
1512
export AbstractInterval, Interval, OpenInterval, ClosedInterval,
1613
, .., ±, ordered, width, duration, leftendpoint, rightendpoint, endpoints,
1714
isopenset, isclosedset, isleftclosed, isrightclosed,

Diff for: src/interval.jl

+1-5
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,8 @@ convert(::Type{TypedEndpointsInterval{L,R}}, d::Interval{L,R}) where {L,R} = d
8181
iv = l..r
8282
8383
Construct a ClosedInterval `iv` spanning the region from `l` to `r`.
84-
85-
(The symbol `..` is the same as in the package EllipsisNotation.jl.)
8684
"""
87-
..
88-
89-
(::Ellipsis)(x, y) = ClosedInterval(x, y)
85+
..(x, y) = ClosedInterval(x, y)
9086

9187

9288
"""

Diff for: test/runtests.jl

+1-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ closedendpoints(I::MyUnitInterval) = (I.isleftclosed,I.isrightclosed)
2222
struct IncompleteInterval <: AbstractInterval{Int} end
2323

2424
@testset "IntervalSets" begin
25-
if VERSION >= v"1.1"
26-
# Julia 1.0 defines getindex(a::GenericArray, i...) in Test,
27-
# which could cause an ambiguity with getindex(A::AbstractArray, ::EllipsisNotation.Ellipsis)
28-
@test isempty(detect_ambiguities(IntervalSets, Base, Core))
29-
end
25+
@test isempty(detect_ambiguities(IntervalSets, Base, Core))
3026

3127
@test ordered(2, 1) == (1, 2)
3228
@test ordered(1, 2) == (1, 2)

0 commit comments

Comments
 (0)