Skip to content

Commit b568220

Browse files
rmsynromancardenas
andcommitted
riscv: re-export paste macro
Re-exports the `paste` macro to allow using CSR helper macros in external crates. Authored-by: rmsyn <[email protected]> Co-authored-by: romancardenas <[email protected]>
1 parent 00dc02b commit b568220

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

riscv/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#![no_std]
3636
#![allow(clippy::missing_safety_doc)]
3737

38+
pub use paste::paste;
39+
3840
pub mod asm;
3941
pub mod bits;
4042
pub mod delay;

riscv/src/register/macros.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ macro_rules! read_write_csr_field {
756756
$(#[$field_doc:meta])+
757757
$field:ident: $bit:literal$(,)?
758758
) => {
759-
paste::paste! {
759+
$crate::paste! {
760760
$crate::read_only_csr_field!(
761761
$ty,
762762
$(#[$field_doc])+
@@ -775,7 +775,7 @@ macro_rules! read_write_csr_field {
775775
$(#[$field_doc:meta])+
776776
$field:ident: $bit_start:literal ..= $bit_end:literal$(,)?
777777
) => {
778-
paste::paste! {
778+
$crate::paste! {
779779
$crate::read_only_csr_field!(
780780
$ty,
781781
$(#[$field_doc])+
@@ -794,7 +794,7 @@ macro_rules! read_write_csr_field {
794794
$(#[$field_doc:meta])+
795795
$field:ident: [$bit_start:literal : $bit_end:literal]$(,)?
796796
) => {
797-
paste::paste! {
797+
$crate::paste! {
798798
$crate::read_only_csr_field!(
799799
$ty,
800800
$(#[$field_doc])+
@@ -814,7 +814,7 @@ macro_rules! read_write_csr_field {
814814
$field:ident,
815815
$field_ty:ident: [$field_start:literal : $field_end:literal],
816816
) => {
817-
paste::paste! {
817+
$crate::paste! {
818818
$crate::read_only_csr_field!(
819819
$ty,
820820
$(#[$field_doc])+
@@ -855,7 +855,7 @@ macro_rules! read_only_csr_field {
855855
const _: () = assert!($bit_end < usize::BITS);
856856
const _: () = assert!($bit_start < $bit_end);
857857

858-
paste::paste! {
858+
$crate::paste! {
859859
impl $ty {
860860
$(#[$field_doc])+
861861
#[inline]
@@ -903,7 +903,7 @@ macro_rules! read_only_csr_field {
903903
const _: () = assert!($field_end < usize::BITS);
904904
const _: () = assert!($field_start <= $field_end);
905905

906-
paste::paste! {
906+
$crate::paste! {
907907
impl $ty {
908908
$(#[$field_doc])+
909909
#[inline]
@@ -952,7 +952,7 @@ macro_rules! write_only_csr_field {
952952
const _: () = assert!($bit_end < usize::BITS);
953953
const _: () = assert!($bit_start < $bit_end);
954954

955-
paste::paste! {
955+
$crate::paste! {
956956
impl $ty {
957957
$(#[$field_doc])+
958958
#[doc = ""]

0 commit comments

Comments
 (0)