Skip to content

Update Syn 1.0 -> 2.0 #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tadeohepperle merged 4 commits into from
Feb 29, 2024
Merged

Update Syn 1.0 -> 2.0 #1304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e571878
update syn
tadeohepperle Feb 28, 2024
6a81969
still not working for all examples
tadeohepperle Feb 28, 2024
88d5d25
unblock Tadeo with hacky fix
niklasad1 Feb 28, 2024
a5206e0
clippy
tadeohepperle Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
unblock Tadeo with hacky fix
  • Loading branch information
@niklasad1
niklasad1 committed Feb 28, 2024
commit 88d5d2504ce7ad509098a0a4576ebe85b6140a60
16 changes: 5 additions & 11 deletions proc-macros/src/render_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
// DEALINGS IN THE SOFTWARE.

use std::collections::HashSet;
use std::str::FromStr;

use super::RpcDescription;
use crate::helpers::{generate_where_clause, is_option};
use proc_macro2::{Span, TokenStream as TokenStream2};
use quote::{quote, quote_spanned};
use syn::punctuated::Punctuated;
use syn::{token, AttrStyle, Attribute, Meta, Path, PathSegment};
use syn::Attribute;

impl RpcDescription {
pub(super) fn render_server(&self) -> Result<TokenStream2, syn::Error> {
Expand Down Expand Up @@ -378,16 +378,10 @@ impl RpcDescription {
heck::ToLowerCamelCase::to_lower_camel_case(name.ident.to_string().as_str())
));

let mut punc_attr = Punctuated::new();
let alias = TokenStream2::from_str(alias_vals.as_str()).unwrap();

punc_attr
.push_value(PathSegment { ident: quote::format_ident!("serde"), arguments: Default::default() });

let serde_alias = Attribute {
pound_token: token::Pound::default(),
style: AttrStyle::Outer,
bracket_token: Default::default(),
meta: Meta::Path(Path { leading_colon: None, segments: punc_attr }),
let serde_alias: Attribute = syn::parse_quote! {
#[serde(#alias)]
};

quote! {
Expand Down
1 change: 0 additions & 1 deletion tests/tests/rpc_module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ use jsonrpsee::core::EmptyServerParams;
use jsonrpsee::core::{server::*, RpcResult};
use jsonrpsee::types::error::{ErrorCode, ErrorObject, INVALID_PARAMS_MSG, PARSE_ERROR_CODE};
use jsonrpsee::types::{ErrorObjectOwned, Params, Response, ResponsePayload};
use jsonrpsee::SubscriptionMessage;
use serde::{Deserialize, Serialize};
use tokio::sync::mpsc;
use tokio::time::interval;
Expand Down