From 105bb9cf6735be53f17b5e1e09379989a10ee73c Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sun, 6 Jun 2021 15:59:22 +0200
Subject: [PATCH] Use format_ident! in import helper functions

---
 crates/ruma-api-macros/src/util.rs   | 14 +++++++-------
 crates/ruma-events-macros/src/lib.rs | 12 ++++++------
 crates/ruma-serde-macros/src/util.rs | 12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/crates/ruma-api-macros/src/util.rs b/crates/ruma-api-macros/src/util.rs
index 4e388e83..4e4a111d 100644
--- a/crates/ruma-api-macros/src/util.rs
+++ b/crates/ruma-api-macros/src/util.rs
@@ -2,10 +2,10 @@
 
 use std::collections::BTreeSet;
 
-use proc_macro2::{Span, TokenStream};
+use proc_macro2::TokenStream;
 use proc_macro_crate::{crate_name, FoundCrate};
-use quote::quote;
-use syn::{AttrStyle, Attribute, Ident, Lifetime};
+use quote::{format_ident, quote};
+use syn::{AttrStyle, Attribute, Lifetime};
 
 /// Generates a `TokenStream` of lifetime identifiers `<'lifetime>`.
 pub(crate) fn unique_lifetimes_to_tokens<'a, I: IntoIterator<Item = &'a Lifetime>>(
@@ -25,11 +25,11 @@ pub(crate) fn is_valid_endpoint_path(string: &str) -> bool {
 }
 
 pub(crate) fn import_ruma_api() -> TokenStream {
-    if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma-api") {
-        let import = Ident::new(&possibly_renamed, Span::call_site());
+    if let Ok(FoundCrate::Name(name)) = crate_name("ruma-api") {
+        let import = format_ident!("{}", name);
         quote! { ::#import }
-    } else if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma") {
-        let import = Ident::new(&possibly_renamed, Span::call_site());
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("ruma") {
+        let import = format_ident!("{}", name);
         quote! { ::#import::api }
     } else {
         quote! { ::ruma_api }
diff --git a/crates/ruma-events-macros/src/lib.rs b/crates/ruma-events-macros/src/lib.rs
index 9fb87562..5db57123 100644
--- a/crates/ruma-events-macros/src/lib.rs
+++ b/crates/ruma-events-macros/src/lib.rs
@@ -12,8 +12,8 @@ use event_parse::EventEnumInput;
 use proc_macro::TokenStream;
 use proc_macro2 as pm2;
 use proc_macro_crate::{crate_name, FoundCrate};
-use quote::quote;
-use syn::{parse_macro_input, DeriveInput, Ident};
+use quote::{format_ident, quote};
+use syn::{parse_macro_input, DeriveInput};
 
 use self::{
     event::expand_event, event_content::expand_event_content, event_enum::expand_event_enum,
@@ -91,11 +91,11 @@ pub fn derive_state_event(input: TokenStream) -> TokenStream {
 }
 
 pub(crate) fn import_ruma_events() -> pm2::TokenStream {
-    if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma-events") {
-        let import = Ident::new(&possibly_renamed, pm2::Span::call_site());
+    if let Ok(FoundCrate::Name(name)) = crate_name("ruma-events") {
+        let import = format_ident!("{}", name);
         quote! { ::#import }
-    } else if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma") {
-        let import = Ident::new(&possibly_renamed, pm2::Span::call_site());
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("ruma") {
+        let import = format_ident!("{}", name);
         quote! { ::#import::events }
     } else {
         quote! { ::ruma_events }
diff --git a/crates/ruma-serde-macros/src/util.rs b/crates/ruma-serde-macros/src/util.rs
index 8f6067d5..1615064c 100644
--- a/crates/ruma-serde-macros/src/util.rs
+++ b/crates/ruma-serde-macros/src/util.rs
@@ -1,6 +1,6 @@
-use proc_macro2::{Ident, Span, TokenStream};
+use proc_macro2::{Span, TokenStream};
 use proc_macro_crate::{crate_name, FoundCrate};
-use quote::quote;
+use quote::{format_ident, quote};
 use syn::{ItemEnum, LitStr, Variant};
 
 use crate::{
@@ -9,11 +9,11 @@ use crate::{
 };
 
 pub fn import_ruma_serde() -> TokenStream {
-    if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma-serde") {
-        let import = Ident::new(&possibly_renamed, Span::call_site());
+    if let Ok(FoundCrate::Name(name)) = crate_name("ruma-serde") {
+        let import = format_ident!("{}", name);
         quote! { ::#import }
-    } else if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma") {
-        let import = Ident::new(&possibly_renamed, Span::call_site());
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("ruma") {
+        let import = format_ident!("{}", name);
         quote! { ::#import::serde }
     } else {
         quote! { ::ruma_serde }