From 1e80f13a7ec0f94a52c7f25657128f87478c56f2 Mon Sep 17 00:00:00 2001
From: Jade Abraham <jade.abraham@hpe.com>
Date: Tue, 3 Sep 2024 14:10:40 -0700
Subject: [PATCH] don't show show a deprecation message if the user has key and
 some other comparator special method

Signed-off-by: Jade Abraham <jade.abraham@hpe.com>
---
 test/library/standard/Sort/errors/errors-comparator.chpl        | 2 --
 .../standard/Sort/errors/errors-comparator.keyandcompare.good   | 1 -
 .../standard/Sort/errors/errors-comparator.keyandkeypart.good   | 1 -
 3 files changed, 4 deletions(-)

diff --git a/test/library/standard/Sort/errors/errors-comparator.chpl b/test/library/standard/Sort/errors/errors-comparator.chpl
index 2482122ed864..276c98e149bf 100644
--- a/test/library/standard/Sort/errors/errors-comparator.chpl
+++ b/test/library/standard/Sort/errors/errors-comparator.chpl
@@ -51,7 +51,6 @@ proc keyPartArgs.keyPart(a) {
   return a;
 }
 
-// this should still get a deprecation warning
 // Both key and compare
 record keyAndCompare { }
 proc keyAndCompare.key(a) {
@@ -61,7 +60,6 @@ proc keyAndCompare.compare(a, b) {
   return 0;
 }
 
-// this should still get a deprecation warning
 // Both key and keyPart
 record keyAndKeyPart { }
 proc keyAndKeyPart.key(a) {
diff --git a/test/library/standard/Sort/errors/errors-comparator.keyandcompare.good b/test/library/standard/Sort/errors/errors-comparator.keyandcompare.good
index 0b17b9445436..c2219c0f3402 100644
--- a/test/library/standard/Sort/errors/errors-comparator.keyandcompare.good
+++ b/test/library/standard/Sort/errors/errors-comparator.keyandcompare.good
@@ -1,3 +1,2 @@
 errors-comparator.chpl:9: In function 'main':
-errors-comparator.chpl:17: warning: Defining a comparator with a 'key' method without implementing the keyComparator interface is deprecated. Please implement the keyComparator interface (i.e. 'record keyAndCompare: keyComparator').
 errors-comparator.chpl:17: error: keyAndCompare contains both a key method and a compare method
diff --git a/test/library/standard/Sort/errors/errors-comparator.keyandkeypart.good b/test/library/standard/Sort/errors/errors-comparator.keyandkeypart.good
index b19108916832..a401f5df7f26 100644
--- a/test/library/standard/Sort/errors/errors-comparator.keyandkeypart.good
+++ b/test/library/standard/Sort/errors/errors-comparator.keyandkeypart.good
@@ -1,3 +1,2 @@
 errors-comparator.chpl:9: In function 'main':
-errors-comparator.chpl:17: warning: Defining a comparator with a 'key' method without implementing the keyComparator interface is deprecated. Please implement the keyComparator interface (i.e. 'record keyAndKeyPart: keyComparator').
 errors-comparator.chpl:17: error: keyAndKeyPart contains both a key method and a keyPart method