Browse Source

Revert "Set imports_layout "HorizontalVertical""

This reverts commit fa537d952d.
tags/v0.2.5-alpha.2
Yuma Hiramatsu 4 years ago
parent
commit
bc26f3291b
7 changed files with 8 additions and 34 deletions
  1. +1
    -2
      rclrust-msg-gen/src/parser/types.rs
  2. +1
    -7
      rclrust/examples/logger.rs
  3. +1
    -5
      rclrust/src/clock.rs
  4. +2
    -5
      rclrust/src/parameter/mod.rs
  5. +1
    -6
      rclrust/src/parameter/parameters.rs
  6. +2
    -8
      rclrust/src/wait_set.rs
  7. +0
    -1
      rustfmt.toml

+ 1
- 2
rclrust-msg-gen/src/parser/types.rs View File

@@ -15,8 +15,7 @@ use super::{
use crate::types::{
primitives::*,
sequences::{Array, BoundedSequence, PrimitiveArray, Sequence},
ConstantType,
MemberType,
ConstantType, MemberType,
};

pub fn parse_member_type(s: &str) -> IResult<&str, MemberType> {


+ 1
- 7
rclrust/examples/logger.rs View File

@@ -1,12 +1,6 @@
use anyhow::Result;
use rclrust::{
rclrust_debug,
rclrust_error,
rclrust_fatal,
rclrust_info,
rclrust_warn,
Clock,
Logger,
rclrust_debug, rclrust_error, rclrust_fatal, rclrust_info, rclrust_warn, Clock, Logger,
};
use rclrust_msg::geometry_msgs::msg::Twist;



+ 1
- 5
rclrust/src/clock.rs View File

@@ -3,11 +3,7 @@ use std::mem::MaybeUninit;
use anyhow::{ensure, Context, Result};

use crate::{
error::ToRclRustResult,
impl_from_trait_for_enum,
log::Logger,
rclrust_error,
time::Time,
error::ToRclRustResult, impl_from_trait_for_enum, log::Logger, rclrust_error, time::Time,
};

/// Time source type, used to indicate the source of a time measurement.


+ 2
- 5
rclrust/src/parameter/mod.rs View File

@@ -8,11 +8,8 @@ use std::fmt;
pub(crate) use parameters::Parameters;
pub(crate) use rcl_params::RclParams;
pub(crate) use rclrust_msg::rcl_interfaces::msg::{
Parameter as RclParameter,
ParameterDescriptor,
ParameterType as RclParameterType,
ParameterValue as RclParameterValue,
SetParametersResult,
Parameter as RclParameter, ParameterDescriptor, ParameterType as RclParameterType,
ParameterValue as RclParameterValue, SetParametersResult,
};
pub use type_::ParameterType;
pub use value::ParameterValue;


+ 1
- 6
rclrust/src/parameter/parameters.rs View File

@@ -3,12 +3,7 @@ use std::{collections::HashMap, sync::Mutex};
use anyhow::Result;

use super::{
Parameter,
ParameterDescriptor,
ParameterType,
ParameterValue,
RclParams,
SetParametersResult,
Parameter, ParameterDescriptor, ParameterType, ParameterValue, RclParams, SetParametersResult,
};
use crate::{context::RclContext, error::RclRustError, node::RclNode};



+ 2
- 8
rclrust/src/wait_set.rs View File

@@ -1,14 +1,8 @@
use anyhow::{Context, Result};

use crate::{
client::RclClient,
context::RclContext,
error::ToRclRustResult,
log::Logger,
rclrust_error,
service::RclService,
subscription::RclSubscription,
timer::RclTimer,
client::RclClient, context::RclContext, error::ToRclRustResult, log::Logger, rclrust_error,
service::RclService, subscription::RclSubscription, timer::RclTimer,
};

#[derive(Debug)]


+ 0
- 1
rustfmt.toml View File

@@ -1,6 +1,5 @@
format_code_in_doc_comments = true
group_imports = "StdExternalCrate"
imports_granularity = "Crate"
imports_layout = "HorizontalVertical"
unstable_features = true
use_field_init_shorthand = true

Loading…
Cancel
Save