Skip to content

Rust::com: Replace the unmaintained paste crate to pastey crate #1268

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
limdor merged 1 commit into from
Oct 5, 2026
Merged

Rust::com: Replace the unmaintained paste crate to pastey crate #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions score/mw/com/rust/score_com.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,5 @@ pub use score_com_concept::{
};

#[doc(hidden)]
// See eclipse-score/communication/issues/173 - `paste`crate is still in discussion regarding rust safety certification.
pub use score_com_concept::paste;
// See eclipse-score/communication/issues/173 - `pastey` replaces `paste` for identifier concatenation in the interface macros.
pub use score_com_concept::pastey;
2 changes: 1 addition & 1 deletion score/mw/com/rust/score_com_concept/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rust_library(
srcs = glob(["**/*.rs"]),
proc_macro_deps = [
"//score/mw/com/rust/score_com_macros:score-com-macros",
"@score_communication_crate_index//:paste",
"@score_communication_crate_index//:pastey",
],
visibility = [
"//score/mw/com:__subpackages__",
Expand Down
8 changes: 4 additions & 4 deletions score/mw/com/rust/score_com_concept/interface_macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ macro_rules! interface {
macro_rules! interface_common {
// Default: auto ID = module path + type name
($id:ident) => {
score_com::paste::paste! {
score_com::pastey::paste! {
pub struct [<$id Interface>] {}
impl score_com::Interface for [<$id Interface>] {
const INTERFACE_ID: &'static str =
Expand All @@ -143,7 +143,7 @@ macro_rules! interface_common {
};
// Explicit ID override
($id:ident, $uid:expr) => {
score_com::paste::paste! {
score_com::pastey::paste! {
pub struct [<$id Interface>] {}
impl score_com::Interface for [<$id Interface>] {
const INTERFACE_ID: &'static str = $uid;
Expand All @@ -160,7 +160,7 @@ macro_rules! interface_common {
#[macro_export]
macro_rules! interface_consumer {
($id:ident, $($event_name:ident, Event<$event_type:ty>),+$(,)?) => {
score_com::paste::paste! {
score_com::pastey::paste! {
pub struct [<$id Consumer>]<R: score_com::Runtime + ?Sized> {
$(
pub $event_name: R::Subscriber<$event_type>,
Expand Down Expand Up @@ -192,7 +192,7 @@ macro_rules! interface_consumer {
#[macro_export]
macro_rules! interface_producer {
($id:ident, $($event_name:ident, Event<$event_type:ty>),+$(,)?) => {
score_com::paste::paste! {
score_com::pastey::paste! {
pub struct [<$id Producer>]<R: score_com::Runtime + ?Sized> {
_runtime: core::marker::PhantomData<R>,
instance_info: R::ProviderInfo,
Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/rust/score_com_concept/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ mod reloc;
pub use concept::*;
pub use error::*;
#[doc(hidden)]
pub use paste;
pub use pastey;
pub use reloc::Reloc;
Loading