[
https://issues.apache.org/jira/browse/ARROW-2413?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16430389#comment-16430389
]
ASF GitHub Bot commented on ARROW-2413:
---------------------------------------
pitrou closed pull request #1849: ARROW-2413: [Rust] Remove useless calls to
format!().
URL: https://github.com/apache/arrow/pull/1849
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/rust/src/datatypes.rs b/rust/src/datatypes.rs
index 85278f7bb..f6be52280 100644
--- a/rust/src/datatypes.rs
+++ b/rust/src/datatypes.rs
@@ -49,9 +49,9 @@ impl DataType {
Some(p) if p == "HALF" => Ok(DataType::Float16),
Some(p) if p == "SINGLE" => Ok(DataType::Float32),
Some(p) if p == "DOUBLE" => Ok(DataType::Float64),
- _ => Err(ArrowError::ParseError(format!(
- "floatingpoint precision missing or invalid"
- ))),
+ _ => Err(ArrowError::ParseError(
+ "floatingpoint precision missing or
invalid".to_string(),
+ )),
},
Some(s) if s == "int" => match map.get("isSigned") {
Some(&Value::Bool(true)) => match map.get("bitWidth") {
@@ -60,13 +60,13 @@ impl DataType {
Some(16) => Ok(DataType::Int16),
Some(32) => Ok(DataType::Int32),
Some(64) => Ok(DataType::Int32),
- _ => Err(ArrowError::ParseError(format!(
- "int bitWidth missing or invalid"
- ))),
+ _ => Err(ArrowError::ParseError(
+ "int bitWidth missing or invalid".to_string(),
+ )),
},
- _ => Err(ArrowError::ParseError(format!(
- "int bitWidth missing or invalid"
- ))),
+ _ => Err(ArrowError::ParseError(
+ "int bitWidth missing or invalid".to_string(),
+ )),
},
Some(&Value::Bool(false)) => match map.get("bitWidth") {
Some(&Value::Number(ref n)) => match n.as_u64() {
@@ -74,17 +74,17 @@ impl DataType {
Some(16) => Ok(DataType::UInt16),
Some(32) => Ok(DataType::UInt32),
Some(64) => Ok(DataType::UInt64),
- _ => Err(ArrowError::ParseError(format!(
- "int bitWidth missing or invalid"
- ))),
+ _ => Err(ArrowError::ParseError(
+ "int bitWidth missing or invalid".to_string(),
+ )),
},
- _ => Err(ArrowError::ParseError(format!(
- "int bitWidth missing or invalid"
- ))),
+ _ => Err(ArrowError::ParseError(
+ "int bitWidth missing or invalid".to_string(),
+ )),
},
- _ => Err(ArrowError::ParseError(format!(
- "int signed missing or invalid"
- ))),
+ _ => Err(ArrowError::ParseError(
+ "int signed missing or invalid".to_string(),
+ )),
},
Some(other) => Err(ArrowError::ParseError(format!(
"invalid type name: {}",
@@ -98,10 +98,12 @@ impl DataType {
.collect::<Result<Vec<Field>, ArrowError>>();
Ok(DataType::Struct(fields?))
}
- _ => Err(ArrowError::ParseError(format!("empty type"))),
+ _ => Err(ArrowError::ParseError("empty type".to_string())),
},
},
- _ => Err(ArrowError::ParseError(format!("invalid json value
type"))),
+ _ => Err(ArrowError::ParseError(
+ "invalid json value type".to_string(),
+ )),
}
}
@@ -152,25 +154,25 @@ impl Field {
let name = match map.get("name") {
Some(&Value::String(ref name)) => name.to_string(),
_ => {
- return Err(ArrowError::ParseError(format!(
- "Field missing 'name' attribute"
- )))
+ return Err(ArrowError::ParseError(
+ "Field missing 'name' attribute".to_string(),
+ ))
}
};
let nullable = match map.get("nullable") {
Some(&Value::Bool(b)) => b,
_ => {
- return Err(ArrowError::ParseError(format!(
- "Field missing 'nullable' attribute"
- )))
+ return Err(ArrowError::ParseError(
+ "Field missing 'nullable' attribute".to_string(),
+ ))
}
};
let data_type = match map.get("type") {
Some(t) => DataType::from(t)?,
_ => {
- return Err(ArrowError::ParseError(format!(
- "Field missing 'type' attribute"
- )))
+ return Err(ArrowError::ParseError(
+ "Field missing 'type' attribute".to_string(),
+ ))
}
};
Ok(Field {
@@ -179,9 +181,9 @@ impl Field {
data_type,
})
}
- _ => Err(ArrowError::ParseError(format!(
- "Invalid json value type for field"
- ))),
+ _ => Err(ArrowError::ParseError(
+ "Invalid json value type for field".to_string(),
+ )),
}
}
diff --git a/rust/src/memory.rs b/rust/src/memory.rs
index 41d4c53ee..e3bb786bc 100644
--- a/rust/src/memory.rs
+++ b/rust/src/memory.rs
@@ -28,9 +28,9 @@ pub fn allocate_aligned(size: i64) -> Result<*const u8,
ArrowError> {
let result = libc::posix_memalign(&mut page, ALIGNMENT, size as usize);
match result {
0 => Ok(mem::transmute::<*mut libc::c_void, *const u8>(page)),
- _ => Err(ArrowError::MemoryError(format!(
- "Failed to allocate memory"
- ))),
+ _ => Err(ArrowError::MemoryError(
+ "Failed to allocate memory".to_string(),
+ )),
}
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> [Rust] Remove useless use of `format!`
> --------------------------------------
>
> Key: ARROW-2413
> URL: https://issues.apache.org/jira/browse/ARROW-2413
> Project: Apache Arrow
> Issue Type: Improvement
> Components: Rust
> Reporter: Bruce Mitchener
> Priority: Minor
> Labels: pull-request-available
>
> Running clippy on Arrow's Rust implementation shows a number of places where
> {{format!}} is being called when it isn't necessary.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
