hannes/aws-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hannes:v0.4.0
Branches Tags
hannes:main
hannes:v0.4.0 hannes:v0.3.0 hannes:v0.2.1 hannes:v0.2.0
...
compare: hannes:ece96ac4e5e8ac7ea7bd035bd7d79ee4635ae088
Branches Tags
hannes:main
hannes:v0.4.0 hannes:v0.3.0 hannes:v0.2.1 hannes:v0.2.0

1 Commits
v0.4.0 ... ece96ac4e5

Author SHA1 Message Date
Hannes Körber
ece96ac4e5 Simplify ident handling
Some checks are pending
Rust / build (push) Waiting to run
 2024-11-08 22:50:54 +01:00
2 changed files with 13 additions and 44 deletions
Expand all files Collapse all files

30
aws_macros/src/tag.rs
View File

@@ -24,15 +24,8 @@ fn parse_enum_attributes(attrs: &[syn::Attribute]) -> Option<syn::LitStr> {
.filter(|attr| attr.style == syn::AttrStyle::Outer)
.find_map(|attr| match attr.meta {
syn::Meta::List(ref meta_list) => {
if let (Some(name), 1) = (
meta_list.path.segments.first(),
meta_list.path.segments.len(),
) {
if name.ident == "tag" {
Some(meta_list.clone())
} else {
None
}
if meta_list.path.is_ident("tag") {
Some(meta_list.clone())
} else {
None
}
@@ -49,12 +42,7 @@ fn parse_enum_attributes(attrs: &[syn::Attribute]) -> Option<syn::LitStr> {
syn::Expr::Assign(ref assign) => {
match *assign.left {
syn::Expr::Path(ref exprpath) => {
let segments = &exprpath.path.segments;
let (Some(segment), 1) = (segments.first(), segments.len()) else {
panic!("invalid attribute key")
};
assert!(segment.ident == "rename", "invalid attribute key");
assert!(exprpath.path.is_ident("rename"), "invalid attribute key");
}
_ => panic!("invalid expression in enum variant attribute, left side"),
}
@@ -103,24 +91,18 @@ fn parse_tag_attribute(expr: syn::Expr, elem: &syn::Data) -> Translator {
match *assign.left {
syn::Expr::Path(ref exprpath) => {
let segments = &exprpath.path.segments;
let (Some(segment), 1) = (segments.first(), segments.len()) else {
panic!("invalid attribute key")
};
assert!(segment.ident == "translate", "invalid attribute key");
assert!(exprpath.path.is_ident("translate"), "invalid attribute key");
}
_ => panic!("invalid expression in tag field attribute, left side"),
}
match *assign.right {
syn::Expr::Path(ref exprpath) => {
let segments = &exprpath.path.segments;
let (Some(segment), 1) = (segments.first(), segments.len()) else {
let Some(ident) = exprpath.path.get_ident() else {
panic!("invalid attribute key")
};
match segment.ident.to_string().as_str() {
match ident.to_string().as_str() {
"serde" => Translator::Serde,
"manual" => Translator::Manual,
"transparent" =>

27
aws_macros/src/tags.rs
View File

@@ -26,13 +26,7 @@ struct Element {
fn is_cfg_attribute(attr: &syn::Attribute) -> bool {
match attr.meta {
syn::Meta::List(ref meta_list) => {
let segments = &meta_list.path.segments;
match (segments.first(), segments.len()) {
(Some(segment), 1) => segment.ident == "cfg",
_ => false,
}
}
syn::Meta::List(ref meta_list) => meta_list.path.is_ident("cfg"),
_ => false,
}
}
@@ -93,13 +87,8 @@ fn parse_field_attrs(attrs: &mut Vec<syn::Attribute>) -> Option<String> {
.filter(|&(_i, attr)| attr.style == syn::AttrStyle::Outer)
.find_map(|(i, attr)| match attr.meta {
syn::Meta::List(ref meta_list) => {
let tag = &meta_list.path;
if let (Some(segment), 1) = (tag.segments.first(), tag.segments.len()) {
if segment.ident == "tag" {
Some((i, meta_list.clone()))
} else {
None
}
if meta_list.path.is_ident("tag") {
Some((i, meta_list.clone()))
} else {
None
}
@@ -123,12 +112,10 @@ fn parse_field_attrs(attrs: &mut Vec<syn::Attribute>) -> Option<String> {
match *assign.left {
syn::Expr::Path(ref exprpath) => {
let segments = &exprpath.path.segments;
let (Some(segment), 1) = (segments.first(), segments.len()) else {
panic!("invalid tag field attribute key")
};
assert!(segment.ident == "key", "invalid tag field attribute key");
assert!(
exprpath.path.is_ident("key"),
"invalid tag field attribute key"
);
}
_ => panic!("invalid expression in tag field attribute, left side"),
}