Skip to content

Commit 4bf881f

Browse files
bors[bot]burrbull
andauthored
Merge #599
599: reexport instead of alias r=therealprof a=burrbull Co-authored-by: Andrey Zgarbul <[email protected]>
2 parents 5a4cea8 + dfe6e0e commit 4bf881f

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
- Use reexport instead of type aliases in `derive_from_base`
11+
1012
## [v0.23.0] - 2022-04-26
1113

1214
- Generate const generic version of field array only if `const_generic` enabled

src/generate/register.rs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,32 +1053,25 @@ fn derive_from_base(
10531053
desc: &str,
10541054
) {
10551055
let span = Span::call_site();
1056-
if let (Some(peripheral), Some(register)) = (&base.peripheral, &base.register) {
1056+
let path = if let (Some(peripheral), Some(register)) = (&base.peripheral, &base.register) {
10571057
let pmod_ = peripheral.to_sanitized_snake_case();
10581058
let rmod_ = register.to_sanitized_snake_case();
10591059
let pmod_ = Ident::new(&pmod_, span);
10601060
let rmod_ = Ident::new(&rmod_, span);
10611061

1062-
mod_items.extend(quote! {
1063-
#[doc = #desc]
1064-
pub type #pc =
1065-
crate::#pmod_::#rmod_::#base_pc;
1066-
});
1062+
quote! { crate::#pmod_::#rmod_::#base_pc }
10671063
} else if let Some(register) = &base.register {
10681064
let mod_ = register.to_sanitized_snake_case();
10691065
let mod_ = Ident::new(&mod_, span);
10701066

1071-
mod_items.extend(quote! {
1072-
#[doc = #desc]
1073-
pub type #pc =
1074-
super::#mod_::#base_pc;
1075-
});
1067+
quote! { super::#mod_::#base_pc }
10761068
} else {
1077-
mod_items.extend(quote! {
1078-
#[doc = #desc]
1079-
pub type #pc = #base_pc;
1080-
});
1081-
}
1069+
quote! { #base_pc }
1070+
};
1071+
mod_items.extend(quote! {
1072+
#[doc = #desc]
1073+
pub use #path as #pc;
1074+
});
10821075
}
10831076

10841077
#[derive(Clone, Debug)]

0 commit comments

Comments
 (0)