Skip to content

Commit 8dbb2f5

Browse files
committed
Remove unnecessary conversion Module <-> PkgId
1 parent eebfbd1 commit 8dbb2f5

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

src/piracy.jl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ end
1616

1717
# based on Test/Test.jl#detect_ambiguities
1818
# https://github.com/JuliaLang/julia/blob/v1.9.1/stdlib/Test/src/Test.jl#L1838-L1896
19-
function all_methods(mods::Module...; skip_deprecated::Bool)
19+
function all_methods(mods::Module...; skip_deprecated::Bool = true)
2020
meths = Method[]
2121
mods = collect(mods)::Vector{Module}
2222

@@ -173,12 +173,9 @@ function is_pirate(meth::Method; treat_as_own = Union{Function,Type}[])
173173
)
174174
end
175175

176-
hunt(mod::Module; from::Module = mod, kwargs...) =
177-
hunt(Base.PkgId(mod); from = from, kwargs...)
178-
179-
function hunt(pkg::Base.PkgId; from::Module, skip_deprecated::Bool = true, kwargs...)
180-
filter(all_methods(from; skip_deprecated = skip_deprecated)) do method
181-
Base.PkgId(method.module) === pkg && is_pirate(method; kwargs...)
176+
function hunt(mod::Module; skip_deprecated::Bool = true, kwargs...)
177+
filter(all_methods(mod; skip_deprecated = skip_deprecated)) do method
178+
method.module === mod && is_pirate(method; kwargs...)
182179
end
183180
end
184181

test/test_piracy.jl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ using Aqua: Piracy
6363
using PiracyForeignProject: ForeignType, ForeignParameterizedType, ForeignNonSingletonType
6464

6565
# Get all methods - test length
66-
meths = filter(Piracy.all_methods(PiracyModule; skip_deprecated = true)) do m
66+
meths = filter(Piracy.all_methods(PiracyModule)) do m
6767
m.module == PiracyModule
6868
end
6969

@@ -90,7 +90,7 @@ ThisPkg = Base.PkgId(PiracyModule)
9090
@test !Piracy.is_foreign(Set{Int}, CorePkg; treat_as_own = [])
9191

9292
# Test what is pirate
93-
pirates = filter(m -> Piracy.is_pirate(m), meths)
93+
pirates = Piracy.hunt(PiracyModule)
9494
@test length(pirates) ==
9595
3 + # findfirst
9696
3 + # findmax
@@ -102,7 +102,7 @@ pirates = filter(m -> Piracy.is_pirate(m), meths)
102102
end
103103

104104
# Test what is pirate (with treat_as_own=[ForeignType])
105-
pirates = filter(m -> Piracy.is_pirate(m; treat_as_own = [ForeignType]), meths)
105+
pirates = Piracy.hunt(PiracyModule, treat_as_own = [ForeignType])
106106
@test length(pirates) ==
107107
3 + # findfirst
108108
3 + # findmin
@@ -112,7 +112,7 @@ pirates = filter(m -> Piracy.is_pirate(m; treat_as_own = [ForeignType]), meths)
112112
end
113113

114114
# Test what is pirate (with treat_as_own=[ForeignParameterizedType])
115-
pirates = filter(m -> Piracy.is_pirate(m; treat_as_own = [ForeignParameterizedType]), meths)
115+
pirates = Piracy.hunt(PiracyModule, treat_as_own = [ForeignParameterizedType])
116116
@test length(pirates) ==
117117
3 + # findfirst
118118
3 + # findmax
@@ -135,8 +135,7 @@ pirates = filter(
135135
end
136136

137137
# Test what is pirate (with treat_as_own=[Base.findfirst, Base.findmax])
138-
pirates =
139-
filter(m -> Piracy.is_pirate(m; treat_as_own = [Base.findfirst, Base.findmax]), meths)
138+
pirates = Piracy.hunt(PiracyModule, treat_as_own = [Base.findfirst, Base.findmax])
140139
@test length(pirates) ==
141140
3 + # findmin
142141
1 + # ForeignType callable

0 commit comments

Comments
 (0)