Skip to content

Commit d3b1171

Browse files
authored
Switch from actions-rs to dtolnay/rust-toolchain (#247)
* Switch from actions-rs to dtolnay/rust-toolchain The reason is that actions-rs became unmaintained. Also, dtolnay's rust-toolchain is simpler (at least in terms of code size). * Make clippy happy
1 parent 1c07227 commit d3b1171

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,8 @@ jobs:
5252
required-ros-distributions: ${{ matrix.ros_distribution }}
5353

5454
- name: Setup Rust
55-
uses: actions-rs/toolchain@v1
55+
uses: dtolnay/rust-toolchain@stable
5656
with:
57-
profile: minimal
58-
toolchain: stable
59-
override: true
6057
components: clippy, rustfmt
6158

6259
- name: Install colcon-cargo and colcon-ros-cargo

rclrs/src/error.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::ffi::{CStr, NulError};
44
use std::fmt::{self, Display};
55

66
/// The main error type.
7-
#[derive(Debug, PartialEq)]
7+
#[derive(Debug, PartialEq, Eq)]
88
pub enum RclrsError {
99
/// An error originating in the `rcl` layer.
1010
RclError {
@@ -59,7 +59,7 @@ impl Display for RclrsError {
5959
///
6060
/// [1]: std::error::Error
6161
/// [2]: crate::RclrsError
62-
#[derive(Debug, PartialEq)]
62+
#[derive(Debug, PartialEq, Eq)]
6363
pub struct RclErrorMsg(String);
6464

6565
impl Display for RclErrorMsg {
@@ -87,7 +87,7 @@ impl Error for RclrsError {
8787
/// Most of these return codes should never occur in an `rclrs` application,
8888
/// since they are returned when `rcl` functions are used wrongly..
8989
#[repr(i32)]
90-
#[derive(Debug, PartialEq)]
90+
#[derive(Debug, PartialEq, Eq)]
9191
pub enum RclReturnCode {
9292
/// Success
9393
Ok = 0,

rclrs/src/node/graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl Drop for rcutils_string_array_t {
3838
pub type TopicNamesAndTypes = HashMap<String, Vec<String>>;
3939

4040
/// Stores a node's name and namespace
41-
#[derive(Debug, PartialEq)]
41+
#[derive(Debug, PartialEq, Eq)]
4242
pub struct NodeNameInfo {
4343
/// The name of the node
4444
pub name: String,

0 commit comments

Comments
 (0)