commit ce5492043f9a807639ae4046c89298d5b4556705
author Devin Jeanpierre <jeanpierreda@google.com> Mon Jul 25 08:54:34 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 25 08:55:12 2022 -0700
tree 73cb6dc93fc1a30622a2d6d6b5c4f008a78d84af
parent 9f55817e5fdbf2e7027f76727d247b7d9264e351

`PtrEq<Rc<T>>` ⟶ `RcEq<T>`.

I was convinced by conversing with more experienced rustaceans that there's no point to this -- people need to understand the type-specific semantics of `Eq` anyway, and it's fine not to forward.

And anyway, if Chalk does it (also written by experts), how bad can it be?

PiperOrigin-RevId: 463096161

rs_bindings_from_cc/src_code_gen.rs

diff --git a/rs_bindings_from_cc/src_code_gen.rs b/rs_bindings_from_cc/src_code_gen.rs
index ff85a50..c2a2293 100644
--- a/rs_bindings_from_cc/src_code_gen.rs
+++ b/rs_bindings_from_cc/src_code_gen.rs
@@ -8,7 +8,7 @@
 use itertools::Itertools;
 use proc_macro2::{Ident, Literal, TokenStream};
 use quote::{format_ident, quote, ToTokens};
-use salsa_utils::PtrEq;
+use salsa_utils::RcEq;
 use std::collections::{BTreeSet, HashSet};
 use std::ffi::{OsStr, OsString};
 use std::iter::{self, Iterator};
@@ -85,7 +85,7 @@
     fn generate_func(
         &self,
         func: Rc<Func>,
-    ) -> Result<Option<PtrEq<Rc<(RsSnippet, RsSnippet, Rc<FunctionId>)>>>>;
+    ) -> Result<Option<RcEq<(RsSnippet, RsSnippet, Rc<FunctionId>)>>>;
 
     fn overloaded_funcs(&self) -> Rc<HashSet<Rc<FunctionId>>>;
 }
@@ -718,7 +718,7 @@
 fn generate_func(
     db: &dyn BindingsGenerator,
     func: Rc<Func>,
-) -> Result<Option<PtrEq<Rc<(RsSnippet, RsSnippet, Rc<FunctionId>)>>>> {
+) -> Result<Option<RcEq<(RsSnippet, RsSnippet, Rc<FunctionId>)>>> {
     let ir = db.ir();
     let mut features = BTreeSet::new();
     let param_types = func
@@ -1066,11 +1066,11 @@
         }
     }
 
-    Ok(Some(PtrEq(Rc::new((
+    Ok(Some(RcEq::new((
         RsSnippet { features, tokens: api_func },
         thunk.into(),
         Rc::new(function_id),
-    )))))
+    ))))
 }
 
 fn generate_func_thunk(
@@ -1840,7 +1840,7 @@
             },
             Ok(None) => GeneratedItem::default(),
             Ok(Some(f)) => {
-                let (api_func, thunk, function_id) = f.as_ref();
+                let (api_func, thunk, function_id) = &*f;
                 if overloaded_funcs.contains(function_id) {
                     GeneratedItem {
                         item: generate_unsupported(&make_unsupported_fn(
@@ -1921,7 +1921,7 @@
     let mut overloaded_funcs = HashSet::new();
     for func in db.ir().functions() {
         if let Ok(Some(f)) = db.generate_func(func.clone()) {
-            let (.., function_id) = f.as_ref();
+            let (.., function_id) = &*f;
             if !seen_funcs.insert(function_id.clone()) {
                 overloaded_funcs.insert(function_id.clone());
             }