Skip to content
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.

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

Update GitHub actions #352

Merged
merged 5 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ jobs:
container:
image: ${{ matrix.docker_image }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Search packages in this repository
id: list_packages
run: |
echo ::set-output name=package_list::$(colcon list --names-only)

- name: Setup ROS environment
uses: ros-tooling/setup-ros@v0.6
uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: ${{ matrix.ros_distribution }}
use-ros2-testing: ${{ matrix.ros_distribution == 'rolling' }}

- name: Setup Rust
uses: dtolnay/rust-toolchain@1.71.0
uses: dtolnay/rust-toolchain@1.74.0
esteve marked this conversation as resolved.
Show resolved Hide resolved
with:
components: clippy, rustfmt

Expand Down
9 changes: 4 additions & 5 deletions rclrs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,13 @@ pub fn create_node(context: &Context, node_name: &str) -> Result<Arc<Node>, Rclr
Node::new(context, node_name)
}

/// Creates a [`NodeBuilder`][1].
/// Creates a [`NodeBuilder`].
///
/// Convenience function equivalent to [`NodeBuilder::new()`][2] and [`Node::builder()`][3].
/// Convenience function equivalent to [`NodeBuilder::new()`][1] and [`Node::builder()`][2].
/// Please see that function's documentation.
///
/// [1]: crate::NodeBuilder
/// [2]: crate::NodeBuilder::new
/// [3]: crate::Node::builder
/// [1]: crate::NodeBuilder::new
/// [2]: crate::Node::builder
///
/// # Example
/// ```
Expand Down
2 changes: 1 addition & 1 deletion rosidl_runtime_rs/src/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ macro_rules! string_impl {

impl PartialOrd for $string {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
self.deref().partial_cmp(other.deref())
Some(self.cmp(other))
}
}

Expand Down
2 changes: 1 addition & 1 deletion rosidl_runtime_rs/src/string/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl Serialize for WString {
{
// Not particularly efficient
// SAFETY: See the Display implementation.
let u16_slice = unsafe { std::slice::from_raw_parts(self.data as *mut u16, self.size) };
let u16_slice = unsafe { std::slice::from_raw_parts(self.data, self.size) };
let s = std::string::String::from_utf16_lossy(u16_slice);
serializer.serialize_str(&s)
}
Expand Down
Loading