From 1878e8aae07899f14d35fdcc5a3b4a229368e2d5 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 5 Apr 2021 13:13:28 +0200 Subject: [PATCH] Replace some turbofishes with type annotations --- ruma-api-macros/src/api/attribute.rs | 2 +- ruma-api-macros/src/api/parse.rs | 8 ++++---- ruma-events-macros/src/event.rs | 4 ++-- ruma-events-macros/src/event_content.rs | 8 ++++---- ruma-events-macros/src/event_enum.rs | 12 ++++++------ ruma-events-macros/src/event_parse.rs | 14 +++++++------- ruma-identifiers-macros/src/lib.rs | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ruma-api-macros/src/api/attribute.rs b/ruma-api-macros/src/api/attribute.rs index da592a8e..5b17d5bf 100644 --- a/ruma-api-macros/src/api/attribute.rs +++ b/ruma-api-macros/src/api/attribute.rs @@ -40,7 +40,7 @@ impl Parse for Meta { let ident = input.parse()?; if input.peek(Token![=]) { - let _ = input.parse::(); + let _: Token![=] = input.parse()?; Ok(Meta::NameValue(MetaNameValue { name: ident, value: input.parse()? })) } else { Ok(Meta::Word(ident)) diff --git a/ruma-api-macros/src/api/parse.rs b/ruma-api-macros/src/api/parse.rs index a52d35ff..c6865c82 100644 --- a/ruma-api-macros/src/api/parse.rs +++ b/ruma-api-macros/src/api/parse.rs @@ -69,8 +69,8 @@ impl Parse for Api { impl Parse for Request { fn parse(input: ParseStream<'_>) -> syn::Result { let attributes = input.call(Attribute::parse_outer)?; - let request_kw = input.parse::()?; - input.parse::()?; + let request_kw: kw::request = input.parse()?; + let _: Token![:] = input.parse()?; let fields; braced!(fields in input); @@ -201,8 +201,8 @@ impl Parse for Request { impl Parse for Response { fn parse(input: ParseStream<'_>) -> syn::Result { let attributes = input.call(Attribute::parse_outer)?; - let response_kw = input.parse::()?; - input.parse::()?; + let response_kw: kw::response = input.parse()?; + let _: Token![:] = input.parse()?; let fields; braced!(fields in input); diff --git a/ruma-events-macros/src/event.rs b/ruma-events-macros/src/event.rs index 8507a970..1c27e6fc 100644 --- a/ruma-events-macros/src/event.rs +++ b/ruma-events-macros/src/event.rs @@ -481,9 +481,9 @@ fn to_camel_case(name: &Ident) -> Ident { let span = name.span(); let name = name.to_string(); - let s = name + let s: String = name .split('_') .map(|s| s.chars().next().unwrap().to_uppercase().to_string() + &s[1..]) - .collect::(); + .collect(); Ident::new(&s, span) } diff --git a/ruma-events-macros/src/event_content.rs b/ruma-events-macros/src/event_content.rs index 3fdc7209..f090ed3e 100644 --- a/ruma-events-macros/src/event_content.rs +++ b/ruma-events-macros/src/event_content.rs @@ -44,14 +44,14 @@ impl Parse for EventMeta { fn parse(input: ParseStream) -> syn::Result { let lookahead = input.lookahead1(); if lookahead.peek(Token![type]) { - input.parse::()?; - input.parse::()?; + let _: Token![type] = input.parse()?; + let _: Token![=] = input.parse()?; input.parse().map(EventMeta::Type) } else if lookahead.peek(kw::skip_redaction) { - input.parse::()?; + let _: kw::skip_redaction = input.parse()?; Ok(EventMeta::SkipRedacted) } else if lookahead.peek(kw::custom_redacted) { - input.parse::()?; + let _: kw::custom_redacted = input.parse()?; Ok(EventMeta::CustomRedacted) } else { Err(lookahead.error()) diff --git a/ruma-events-macros/src/event_enum.rs b/ruma-events-macros/src/event_enum.rs index b47f48e8..6e706fa9 100644 --- a/ruma-events-macros/src/event_enum.rs +++ b/ruma-events-macros/src/event_enum.rs @@ -816,10 +816,10 @@ fn to_event_path(name: &LitStr, struct_name: &Ident, ruma_events: &TokenStream) let path: Vec<_> = name[2..].split('.').collect(); let event_str = path.last().unwrap(); - let event = event_str + let event: String = event_str .split('_') .map(|s| s.chars().next().unwrap().to_uppercase().to_string() + &s[1..]) - .collect::(); + .collect(); let path = path.iter().map(|s| Ident::new(s, span)); @@ -869,10 +869,10 @@ fn to_event_content_path( let path: Vec<_> = name[2..].split('.').collect(); let event_str = path.last().unwrap(); - let event = event_str + let event: String = event_str .split('_') .map(|s| s.chars().next().unwrap().to_uppercase().to_string() + &s[1..]) - .collect::(); + .collect(); let content_str = match kind { EventKind::ToDevice => format_ident!("{}ToDeviceEventContent", event), @@ -899,10 +899,10 @@ fn to_camel_case(name: &LitStr) -> syn::Result { )); } - let s = name[2..] + let s: String = name[2..] .split(&['.', '_'] as &[char]) .map(|s| s.chars().next().unwrap().to_uppercase().to_string() + &s[1..]) - .collect::(); + .collect(); Ok(Ident::new(&s, span)) } diff --git a/ruma-events-macros/src/event_parse.rs b/ruma-events-macros/src/event_parse.rs index a0f927e4..a2980c43 100644 --- a/ruma-events-macros/src/event_parse.rs +++ b/ruma-events-macros/src/event_parse.rs @@ -129,7 +129,7 @@ impl EventKind { impl Parse for EventKind { fn parse(input: ParseStream) -> syn::Result { - let ident = input.parse::()?; + let ident: Ident = input.parse()?; Ok(match ident.to_string().as_str() { "Basic" => EventKind::Basic, "EphemeralRoom" => EventKind::Ephemeral, @@ -201,16 +201,16 @@ impl Parse for EventEnumInput { fn parse(input: ParseStream<'_>) -> parse::Result { let attrs = input.call(Attribute::parse_outer)?; // "name" field - input.parse::()?; - input.parse::()?; + let _: kw::kind = input.parse()?; + let _: Token![:] = input.parse()?; // the name of our event enum - let name = input.parse::()?; - input.parse::()?; + let name: EventKind = input.parse()?; + let _: Token![,] = input.parse()?; // "events" field - input.parse::()?; - input.parse::()?; + let _: kw::events = input.parse()?; + let _: Token![:] = input.parse()?; // an array of event names `["m.room.whatever", ...]` let content; diff --git a/ruma-identifiers-macros/src/lib.rs b/ruma-identifiers-macros/src/lib.rs index 4b6f2c51..0fdeeb45 100644 --- a/ruma-identifiers-macros/src/lib.rs +++ b/ruma-identifiers-macros/src/lib.rs @@ -18,7 +18,7 @@ struct Input { impl Parse for Input { fn parse(input: syn::parse::ParseStream) -> syn::Result { let dollar_crate = input.parse()?; - input.parse::()?; + let _: Token![,] = input.parse()?; let id = input.parse()?; Ok(Self { dollar_crate, id })