remove index canonical name

Author: Shubham8287

crates/bindings-macro/src/table.rs

@@ -1,6 +1,6 @@
 use crate::sats;
 use crate::sym;
-use crate::util::{check_duplicate, check_duplicate_msg, ident_to_litstr, match_meta};
+use crate::util::{check_duplicate, check_duplicate_msg, match_meta};
 use core::slice;
 use heck::ToSnakeCase;
 use proc_macro2::{Span, TokenStream};
@@ -176,7 +176,6 @@ impl ScheduledArg {
 impl IndexArg {
     fn parse_meta(meta: ParseNestedMeta) -> syn::Result<Self> {
         let mut accessor = None;
-        let mut _name = None;
         let mut algo = None;
 
         meta.parse_nested_meta(|meta| {
@@ -185,11 +184,6 @@ impl IndexArg {
                     check_duplicate(&accessor, &meta)?;
                     accessor = Some(meta.value()?.parse()?);
                 }
-                sym::name => {
-                    check_duplicate(&_name, &meta)?;
-                    let litstr: LitStr = meta.value()?.parse()?;
-                    _name = Some(litstr);
-                }
                 sym::btree => {
                     check_duplicate_msg(&algo, &meta, "index algorithm specified twice")?;
                     algo = Some(Self::parse_btree(meta)?);
@@ -273,8 +267,6 @@ impl IndexArg {
     /// Parses an inline `#[index(btree)]`, `#[index(hash)]`, or `#[index(direct)]` attribute on a field.
     fn parse_index_attr(field: &Ident, attr: &syn::Attribute) -> syn::Result<Self> {
         let mut kind = None;
-        let mut accessor: Option<Ident> = None;
-        let mut _name: Option<LitStr> = None;
         attr.parse_nested_meta(|meta| {
             match_meta!(match meta {
                 sym::btree => {
@@ -293,22 +285,14 @@ impl IndexArg {
                     check_duplicate_msg(&kind, &meta, "index type specified twice")?;
                     kind = Some(IndexType::Direct { column: field.clone() })
                 }
-                sym::accessor => {
-                    check_duplicate(&accessor, &meta)?;
-                    accessor = Some(meta.value()?.parse()?);
-                }
-                sym::name => {
-                    check_duplicate(&_name, &meta)?;
-                    _name = Some(meta.value()?.parse()?);
-                }
             });
             Ok(())
         })?;
         let kind =
             kind.ok_or_else(|| syn::Error::new_spanned(&attr.meta, "must specify kind of index (`btree` , `direct`)"))?;
 
         // Default accessor = field name if not provided
-        let accessor = accessor.unwrap_or_else(|| field.clone());
+        let accessor = field.clone();
         Ok(IndexArg::new(accessor, kind))
     }
 
@@ -457,14 +441,12 @@ impl ValidatedIndex<'_> {
                 })
             }
         };
-        let accessor_name = ident_to_litstr(self.accessor_name);
-        let index_name = &self.index_name;
+        let source_name = self.index_name.clone();
         // Note: we do not pass the index_name through here.
         // We trust the schema validation logic to reconstruct the name we've stored in `self.name`.
         //TODO(shub): pass generated index name instead of accessor name as source_name
         quote!(spacetimedb::table::IndexDesc {
-            source_name: #accessor_name,
-            index_name: #index_name,
+            source_name: #source_name,
             algo: #algo,
         })
     }
@@ -1066,9 +1048,11 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
     let trait_def = quote_spanned! {table_ident.span()=>
         #[allow(non_camel_case_types, dead_code)]
         #vis trait #table_ident {
+            #[allow(non_camel_case_types, dead_code)]
             fn #table_ident(&self) -> &#tablehandle_ident;
         }
         impl #table_ident for spacetimedb::Local {
+            #[allow(non_camel_case_types, dead_code)]
             fn #table_ident(&self) -> &#tablehandle_ident {
                 &#tablehandle_ident {}
             }
@@ -1078,6 +1062,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
     let trait_def_view = quote_spanned! {table_ident.span()=>
         #[allow(non_camel_case_types, dead_code)]
         #vis trait #view_trait_ident {
+            #[allow(non_camel_case_types, dead_code)]
             fn #table_ident(&self) -> &#viewhandle_ident;
         }
         impl #view_trait_ident for spacetimedb::LocalReadOnly {

crates/bindings/src/table.rs

@@ -140,7 +140,6 @@ pub trait TableInternal: Sized {
 #[derive(Clone, Copy)]
 pub struct IndexDesc<'a> {
     pub source_name: &'a str,
-    pub index_name: &'a str,
     pub algo: IndexAlgo<'a>,
 }