Interoperate with Match.jl v2 (#33)

* Also removes support for interoperation with `Rematch.jl` and `Rematch2.jl`.
* Remove `Manifest.toml` from the repository.

Project.toml

@@ -1,20 +1,19 @@
 name = "AutoHashEqualsCached"
 uuid = "887ad303-ad3a-4bc5-965e-507c643d6945"
 authors = ["Neal Gafter <neal@gafter.com> and contributors"]
-version = "0.2.2"
+version = "0.3.0"
 
 [deps]
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-Rematch2 = "351a7294-9038-49b6-b9cf-e076b05af63f"
+Match = "7eb4fadd-790c-5f42-8a69-bfa0b872bfbf"
 
 [compat]
-Rematch = "0.3"
+Match = "2"
 julia = "1.6"
 
 [extras]
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-Rematch = "bfecab0d-fd4d-5014-a23f-56c5fae6447a"
-Rematch2 = "351a7294-9038-49b6-b9cf-e076b05af63f"
+Match = "7eb4fadd-790c-5f42-8a69-bfa0b872bfbf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]

src/AutoHashEqualsCached.jl

@@ -260,16 +260,11 @@ function auto_hash_equals_cached_impl(__source__::LineNumberNode, alt_hash_name,
  $_show_default_auto_hash_equals_cached(io, x)
  end)))
 
- # Add functions to interoperate with Rematch and Rematch2 if they are loaded
+ # Add functions to interoperate with Match if loaded
  # at the time the macro is expanded.
- if_has_package("Rematch", Base.UUID("bfecab0d-fd4d-5014-a23f-56c5fae6447a"), v"0.3.3") do pkg
- push!(result.args, esc(:(function $pkg.evaluated_fieldcount(::Type{$type_name})
- $(length(member_names))
- end)))
- end
- if_has_package("Rematch2", Base.UUID("351a7294-9038-49b6-b9cf-e076b05af63f"), v"0.2.6") do pkg
- if :fieldnames in names(pkg; all=true)
- push!(result.args, esc(:(function $pkg.fieldnames(::Type{$type_name})
+ if_has_package("Match", Base.UUID("7eb4fadd-790c-5f42-8a69-bfa0b872bfbf"), v"2") do pkg
+ if :match_fieldnames in names(pkg; all=true)
+ push!(result.args, esc(:(function $pkg.match_fieldnames(::Type{$type_name})
  $((member_names...,))
  end)))
  end

test/Project.toml

@@ -2,6 +2,5 @@
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-Rematch = "bfecab0d-fd4d-5014-a23f-56c5fae6447a"
-Rematch2 = "351a7294-9038-49b6-b9cf-e076b05af63f"
+Match = "7eb4fadd-790c-5f42-8a69-bfa0b872bfbf"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

test/runtests.jl

@@ -6,7 +6,7 @@ using AutoHashEqualsCached: @auto_hash_equals, @auto_hash_equals_cached
 using Markdown: plain
 using Serialization
 using Test
-using Rematch: Rematch, @match, MatchFailure
+using Match: Match, @match, MatchFailure
 using Random
 
 function serialize_and_deserialize(x)
@@ -235,37 +235,6 @@ myhash(o) = myhash(o, UInt(0x0))
  end
  end
 
- @testset "test interoperation with Rematch" begin
-
- @testset "test simple Rematch usage" begin
- struct R157; x; y; end
- @test (Rematch.@match R157(z,2) = R157(1,2)) == R157(1,2) && z == 1
- @test_throws Rematch.MatchFailure Rematch.@match R157(x, 3) = R157(1,2)
- @test (Rematch.@match R157(1,2) begin
- R157(x=x1,y=y1) => (x1,y1)
- end) == (1,2)
- end
-
- @testset "make sure Rematch works for types with cached hash code" begin
- @auto_hash_equals_cached struct R158; x; y::Int; end
- @test (Rematch.@match R158(x,2) = R158(1,2)) == R158(1,2) && x == 1
- @test_throws Rematch.MatchFailure Rematch.@match R158(x, 3) = R158(1,2)
- @test (Rematch.@match R158(1,2) begin
- R158(x=x1,y=y1) => (x1,y1)
- end) == (1,2)
- end
-
- @testset "make sure Rematch works for generic types with cached hash code" begin
- @auto_hash_equals_cached struct R159{T}; x; y::T; end
- @test (Rematch.@match R159(x,2) = R159(1,2)) == R159(1,2) && x == 1
- @test_throws Rematch.MatchFailure Rematch.@match R159(x, 3) = R159(1,2)
- @test (Rematch.@match R159(1,2) begin
- R159(x=x1,y=y1) => (x1,y1)
- end) == (1,2)
- end
-
- end
-
  @testset "give an error if the struct contains internal constructors 4" begin
  @test_throws internal_constructor_error begin
  @macroexpand @auto_hash_equals_cached struct T156