From 0d7d54e21c49f2ba5090dd9df7247f3485a9a96a Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Sat, 26 Sep 2020 12:08:15 +0800
Subject: [PATCH] Simplify rename checking.

---
 codegen/src/rhai_module.rs | 61 ++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/codegen/src/rhai_module.rs b/codegen/src/rhai_module.rs
index ab0dd117..f6939ae7 100644
--- a/codegen/src/rhai_module.rs
+++ b/codegen/src/rhai_module.rs
@@ -183,23 +183,24 @@ pub(crate) fn flatten_type_groups(ty: &syn::Type) -> &syn::Type {
 }
 
 pub(crate) fn check_rename_collisions(fns: &Vec<ExportedFn>) -> Result<(), syn::Error> {
-    fn make_key(name: String, itemfn: &ExportedFn) -> String {
-        itemfn.arg_list().fold(name, |mut argstr, fnarg| {
-            let type_string: String = match fnarg {
-                syn::FnArg::Receiver(_) => unimplemented!("receiver rhai_fns not implemented"),
-                syn::FnArg::Typed(syn::PatType { ref ty, .. }) => {
-                    ty.as_ref().to_token_stream().to_string()
-                }
-            };
-            argstr.push('.');
-            argstr.push_str(&type_string);
-            argstr
-        })
+    fn make_key(name: impl ToString, itemfn: &ExportedFn) -> String {
+        itemfn
+            .arg_list()
+            .fold(name.to_string(), |mut argstr, fnarg| {
+                let type_string: String = match fnarg {
+                    syn::FnArg::Receiver(_) => unimplemented!("receiver rhai_fns not implemented"),
+                    syn::FnArg::Typed(syn::PatType { ref ty, .. }) => {
+                        ty.as_ref().to_token_stream().to_string()
+                    }
+                };
+                argstr.push('.');
+                argstr.push_str(&type_string);
+                argstr
+            })
     }
 
     let mut renames = HashMap::<String, proc_macro2::Span>::new();
-    let mut fn_names = HashMap::<String, proc_macro2::Span>::new();
-    let mut fn_sig = HashMap::<String, proc_macro2::Span>::new();
+    let mut fn_defs = HashMap::<String, proc_macro2::Span>::new();
 
     for itemfn in fns.iter() {
         if itemfn.params().name.is_some() || itemfn.params().special != FnSpecialAccess::None {
@@ -216,7 +217,7 @@ pub(crate) fn check_rename_collisions(fns: &Vec<ExportedFn>) -> Result<(), syn::
 
             for (name, fn_name) in names {
                 let current_span = itemfn.params().span.as_ref().unwrap();
-                let key = make_key(name.clone(), itemfn);
+                let key = make_key(&name, itemfn);
                 if let Some(other_span) = renames.insert(key, *current_span) {
                     let mut err = syn::Error::new(
                         *current_span,
@@ -231,7 +232,7 @@ pub(crate) fn check_rename_collisions(fns: &Vec<ExportedFn>) -> Result<(), syn::
             }
         } else {
             let ident = itemfn.name();
-            if let Some(other_span) = fn_names.insert(ident.to_string(), ident.span()) {
+            if let Some(other_span) = fn_defs.insert(ident.to_string(), ident.span()) {
                 let mut err = syn::Error::new(
                     ident.span(),
                     format!("duplicate function '{}'", ident.to_string()),
@@ -242,24 +243,20 @@ pub(crate) fn check_rename_collisions(fns: &Vec<ExportedFn>) -> Result<(), syn::
                 ));
                 return Err(err);
             }
-            let key = make_key(ident.to_string(), itemfn);
-            fn_sig.insert(key, ident.span());
+            let key = make_key(ident, itemfn);
+            if let Some(fn_span) = renames.get(&key) {
+                let mut err = syn::Error::new(
+                    ident.span(),
+                    format!("duplicate Rhai signature for '{}'", &ident),
+                );
+                err.combine(syn::Error::new(
+                    *fn_span,
+                    format!("duplicated function '{}'", &ident),
+                ));
+                return Err(err);
+            }
         }
     }
 
-    for (new_name, attr_span) in renames.drain() {
-        let fn_name = new_name.split('.').next().unwrap();
-        if let Some(fn_span) = fn_sig.get(&new_name) {
-            let mut err = syn::Error::new(
-                attr_span,
-                format!("duplicate Rhai signature for '{}'", &fn_name),
-            );
-            err.combine(syn::Error::new(
-                *fn_span,
-                format!("duplicated function '{}'", &fn_name),
-            ));
-            return Err(err);
-        }
-    }
     Ok(())
 }