From 8c98b0798e0cfc751e9cda1d415ab30298461281 Mon Sep 17 00:00:00 2001 From: Iosmanthus Teng Date: Tue, 28 May 2019 10:37:52 +0800 Subject: [PATCH] Replace all `Into` with `From` Signed-off-by: Iosmanthus Teng --- components/cop_datatype/src/builder/field_type.rs | 6 +++--- components/cop_datatype/src/def/field_type.rs | 12 ++++++------ components/engine/src/rocks/util/config.rs | 6 +++--- components/tikv_util/src/config.rs | 6 +++--- components/tipb_helper/src/expr_def_builder.rs | 6 +++--- src/coprocessor/codec/error.rs | 8 ++++---- src/coprocessor/codec/mysql/time/mod.rs | 6 +++--- src/raftstore/errors.rs | 8 ++++---- src/server/debug.rs | 6 +++--- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/components/cop_datatype/src/builder/field_type.rs b/components/cop_datatype/src/builder/field_type.rs index 5cfc92b5cc6..4119d8aa636 100644 --- a/components/cop_datatype/src/builder/field_type.rs +++ b/components/cop_datatype/src/builder/field_type.rs @@ -42,8 +42,8 @@ impl FieldTypeBuilder { } } -impl Into for FieldTypeBuilder { - fn into(self) -> FieldType { - self.build() +impl From for FieldType { + fn from(fp_builder: FieldTypeBuilder) -> FieldType { + fp_builder.build() } } diff --git a/components/cop_datatype/src/def/field_type.rs b/components/cop_datatype/src/def/field_type.rs index 8589eb515d1..726b4068346 100644 --- a/components/cop_datatype/src/def/field_type.rs +++ b/components/cop_datatype/src/def/field_type.rs @@ -309,18 +309,18 @@ impl FieldTypeAccessor for ColumnInfo { } } -impl Into for FieldTypeTp { - fn into(self) -> FieldType { +impl From for FieldType { + fn from(fp: FieldTypeTp) -> FieldType { let mut ft = FieldType::new(); - ft.as_mut_accessor().set_tp(self); + ft.as_mut_accessor().set_tp(fp); ft } } -impl Into for FieldTypeTp { - fn into(self) -> ColumnInfo { +impl From for ColumnInfo { + fn from(fp: FieldTypeTp) -> ColumnInfo { let mut ft = ColumnInfo::new(); - ft.as_mut_accessor().set_tp(self); + ft.as_mut_accessor().set_tp(fp); ft } } diff --git a/components/engine/src/rocks/util/config.rs b/components/engine/src/rocks/util/config.rs index f766ec0cc9a..42e5e6299c7 100644 --- a/components/engine/src/rocks/util/config.rs +++ b/components/engine/src/rocks/util/config.rs @@ -15,9 +15,9 @@ pub enum CompressionType { ZstdNotFinal, } -impl Into for CompressionType { - fn into(self) -> DBCompressionType { - match self { +impl From for DBCompressionType { + fn from(compression_type: CompressionType) -> DBCompressionType { + match compression_type { CompressionType::No => DBCompressionType::No, CompressionType::Snappy => DBCompressionType::Snappy, CompressionType::Zlib => DBCompressionType::Zlib, diff --git a/components/tikv_util/src/config.rs b/components/tikv_util/src/config.rs index 248293d5bd9..f1d7a0f9d08 100644 --- a/components/tikv_util/src/config.rs +++ b/components/tikv_util/src/config.rs @@ -221,9 +221,9 @@ impl<'de> Deserialize<'de> for ReadableSize { #[derive(Clone, Debug, PartialEq)] pub struct ReadableDuration(pub Duration); -impl Into for ReadableDuration { - fn into(self) -> Duration { - self.0 +impl From for Duration { + fn from(readable: ReadableDuration) -> Duration { + readable.0 } } diff --git a/components/tipb_helper/src/expr_def_builder.rs b/components/tipb_helper/src/expr_def_builder.rs index 3068826d8c1..bd550c04c41 100644 --- a/components/tipb_helper/src/expr_def_builder.rs +++ b/components/tipb_helper/src/expr_def_builder.rs @@ -90,8 +90,8 @@ impl ExprDefBuilder { } } -impl Into for ExprDefBuilder { - fn into(self) -> Expr { - self.build() +impl From for Expr { + fn from(expr_def_builder: ExprDefBuilder) -> Expr { + expr_def_builder.build() } } diff --git a/src/coprocessor/codec/error.rs b/src/coprocessor/codec/error.rs index 3c17bf9ad4f..b33d45dd7fa 100644 --- a/src/coprocessor/codec/error.rs +++ b/src/coprocessor/codec/error.rs @@ -147,11 +147,11 @@ impl Error { } } -impl Into for Error { - fn into(self) -> select::Error { +impl From for select::Error { + fn from(error: Error) -> select::Error { let mut err = select::Error::new(); - err.set_code(self.code()); - err.set_msg(format!("{:?}", self)); + err.set_code(error.code()); + err.set_msg(format!("{:?}", error)); err } } diff --git a/src/coprocessor/codec/mysql/time/mod.rs b/src/coprocessor/codec/mysql/time/mod.rs index 122c96d1c31..42c1b241982 100644 --- a/src/coprocessor/codec/mysql/time/mod.rs +++ b/src/coprocessor/codec/mysql/time/mod.rs @@ -189,9 +189,9 @@ pub enum TimeType { Timestamp, } -impl Into for TimeType { - fn into(self) -> FieldTypeTp { - match self { +impl From for FieldTypeTp { + fn from(time_type: TimeType) -> FieldTypeTp { + match time_type { TimeType::Date => FieldTypeTp::Date, TimeType::DateTime => FieldTypeTp::DateTime, TimeType::Timestamp => FieldTypeTp::Timestamp, diff --git a/src/raftstore/errors.rs b/src/raftstore/errors.rs index ab8ae6879fe..0f96ecc5b8a 100644 --- a/src/raftstore/errors.rs +++ b/src/raftstore/errors.rs @@ -142,12 +142,12 @@ quick_error! { pub type Result = result::Result; -impl Into for Error { - fn into(self) -> errorpb::Error { +impl From for errorpb::Error { + fn from(err: Error) -> errorpb::Error { let mut errorpb = errorpb::Error::new(); - errorpb.set_message(error::Error::description(&self).to_owned()); + errorpb.set_message(error::Error::description(&err).to_owned()); - match self { + match err { Error::RegionNotFound(region_id) => { errorpb.mut_region_not_found().set_region_id(region_id); } diff --git a/src/server/debug.rs b/src/server/debug.rs index c2ac1b9d967..e132d57505e 100644 --- a/src/server/debug.rs +++ b/src/server/debug.rs @@ -116,9 +116,9 @@ impl From for BottommostLevelCompaction { } } -impl Into for BottommostLevelCompaction { - fn into(self) -> debugpb::BottommostLevelCompaction { - match self.0 { +impl From for debugpb::BottommostLevelCompaction { + fn from(bottommost: BottommostLevelCompaction) -> debugpb::BottommostLevelCompaction { + match bottommost.0 { DBBottommostLevelCompaction::Skip => debugpb::BottommostLevelCompaction::Skip, DBBottommostLevelCompaction::Force => debugpb::BottommostLevelCompaction::Force, DBBottommostLevelCompaction::IfHaveCompactionFilter => {