diff --git a/riscv-macros/CHANGELOG.md b/riscv-macros/CHANGELOG.md index 2ff758d3..a47c1cf2 100644 --- a/riscv-macros/CHANGELOG.md +++ b/riscv-macros/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed +- Use fully qualified paths in generated code (i.e., `::riscv` instead of `riscv`) - Moved from `riscv/macros/` to `riscv-macros/` - Now, `riscv::pac_enum` macro only includes trap-related code if `rt` or `rt-v-trap` features are enabled. diff --git a/riscv-macros/src/lib.rs b/riscv-macros/src/lib.rs index d4c252d8..40bf60dd 100644 --- a/riscv-macros/src/lib.rs +++ b/riscv-macros/src/lib.rs @@ -339,7 +339,7 @@ core::arch::global_asm!(" // Push the trait implementation res.push(quote! { - unsafe impl riscv::#trait_name for #name { + unsafe impl ::riscv::#trait_name for #name { const #const_name: usize = #max_discriminant; #[inline] @@ -348,17 +348,17 @@ core::arch::global_asm!(" } #[inline] - fn from_number(number: usize) -> riscv::result::Result { + fn from_number(number: usize) -> ::riscv::result::Result { match number { #(#valid_matches,)* - _ => Err(riscv::result::Error::InvalidVariant(number)), + _ => Err(::riscv::result::Error::InvalidVariant(number)), } } } }); if let Some(marker_trait_name) = attr.marker_trait_name() { - res.push(quote! { unsafe impl riscv::#marker_trait_name for #name {} }); + res.push(quote! { unsafe impl ::riscv::#marker_trait_name for #name {} }); } #[cfg(feature = "rt")]