use a different trait for sysroot-private tests

Author: conradludgate

tests/ui/privacy/sysroot-private.default.stderr

@@ -1,25 +1,25 @@
-error[E0405]: cannot find trait `Equivalent` in this scope
+error[E0405]: cannot find trait `Relocate` in this scope
   --> $DIR/sysroot-private.rs:27:18
    |
-LL | trait Trait2<K>: Equivalent<K> {}
-   |                  ^^^^^^^^^^ not found in this scope
+LL | trait Trait2<K>: Relocate<K> {}
+   |                  ^^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `K` in this scope
-  --> $DIR/sysroot-private.rs:32:35
+  --> $DIR/sysroot-private.rs:32:34
    |
-LL | fn trait_member<T>(val: &T, key: &K) -> bool {
-   |                 -                 ^
+LL | fn trait_member<T>(val: &T, key: K) -> bool {
+   |                 -                ^
    |                 |
    |                 similarly named type parameter `T` defined here
    |
 help: a type parameter with a similar name exists
    |
-LL - fn trait_member<T>(val: &T, key: &K) -> bool {
-LL + fn trait_member<T>(val: &T, key: &T) -> bool {
+LL - fn trait_member<T>(val: &T, key: K) -> bool {
+LL + fn trait_member<T>(val: &T, key: T) -> bool {
    |
 help: you might be missing a type parameter
    |
-LL | fn trait_member<T, K>(val: &T, key: &K) -> bool {
+LL | fn trait_member<T, K>(val: &T, key: K) -> bool {
    |                  +++
 
 error[E0220]: associated type `ExpressionStack` not found for `Trait`

tests/ui/privacy/sysroot-private.rs

@@ -23,16 +23,16 @@ type AssociatedTy = dyn Trait<ExpressionStack = i32, Bar = i32>;
 //~^ ERROR associated type `ExpressionStack` not found
 //[rustc_private_enabled]~| NOTE there is an associated type `ExpressionStack` in the trait `gimli::read::op::EvaluationStorage`
 
-// Attempt to get a suggestion for `hashbrown::Equivalent`
-trait Trait2<K>: Equivalent<K> {}
+// Attempt to get a suggestion for `gimli::read::Relocate`
+trait Trait2<K>: Relocate<K> {}
 //~^ ERROR cannot find trait
 //~| NOTE not found
 
-// Attempt to get a suggestion for `hashbrown::Equivalent::equivalent`
-fn trait_member<T>(val: &T, key: &K) -> bool {
+// Attempt to get a suggestion for `gimli::read::Relocate::relocate_address`
+fn trait_member<T>(val: &T, key: K) -> bool {
     //~^ ERROR cannot find type `K`
     //~| NOTE similarly named
-    val.equivalent(key)
+    val.relocate_address(key, 0).is_ok()
 }
 
 // Attempt to get a suggestion for `memchr::memchr2`

tests/ui/privacy/sysroot-private.rustc_private_enabled.stderr

@@ -1,25 +1,25 @@
-error[E0405]: cannot find trait `Equivalent` in this scope
+error[E0405]: cannot find trait `Relocate` in this scope
   --> $DIR/sysroot-private.rs:27:18
    |
-LL | trait Trait2<K>: Equivalent<K> {}
-   |                  ^^^^^^^^^^ not found in this scope
+LL | trait Trait2<K>: Relocate<K> {}
+   |                  ^^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `K` in this scope
-  --> $DIR/sysroot-private.rs:32:35
+  --> $DIR/sysroot-private.rs:32:34
    |
-LL | fn trait_member<T>(val: &T, key: &K) -> bool {
-   |                 -                 ^
+LL | fn trait_member<T>(val: &T, key: K) -> bool {
+   |                 -                ^
    |                 |
    |                 similarly named type parameter `T` defined here
    |
 help: a type parameter with a similar name exists
    |
-LL - fn trait_member<T>(val: &T, key: &K) -> bool {
-LL + fn trait_member<T>(val: &T, key: &T) -> bool {
+LL - fn trait_member<T>(val: &T, key: K) -> bool {
+LL + fn trait_member<T>(val: &T, key: T) -> bool {
    |
 help: you might be missing a type parameter
    |
-LL | fn trait_member<T, K>(val: &T, key: &K) -> bool {
+LL | fn trait_member<T, K>(val: &T, key: K) -> bool {
    |                  +++
 
 error[E0220]: associated type `ExpressionStack` not found for `Trait`