[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16430484#comment-16430484 ] ASF GitHub Bot commented on ARROW-2415: --- pitrou commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379741162 Ok, thanks! 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Assignee: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[
https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16430482#comment-16430482
]
ASF GitHub Bot commented on ARROW-2415:
---
pitrou closed pull request #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats
warnings.
URL: https://github.com/apache/arrow/pull/1851
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..005a13952 100644
--- a/rust/src/datatypes.rs
+++ b/rust/src/datatypes.rs
@@ -41,8 +41,8 @@ pub enum DataType {
impl DataType {
fn from(json: &Value) -> Result {
//println!("DataType::from({:?})", json);
-match json {
-&Value::Object(ref map) => match map.get("name") {
+match *json {
+Value::Object(ref map) => match map.get("name") {
Some(s) if s == "bool" => Ok(DataType::Boolean),
Some(s) if s == "utf8" => Ok(DataType::Utf8),
Some(s) if s == "floatingpoint" => match map.get("precision") {
@@ -106,21 +106,21 @@ impl DataType {
}
pub fn to_json(&self) -> Value {
-match self {
-&DataType::Boolean => json!({"name": "bool"}),
-&DataType::Int8 => json!({"name": "int", "bitWidth": 8,
"isSigned": true}),
-&DataType::Int16 => json!({"name": "int", "bitWidth": 16,
"isSigned": true}),
-&DataType::Int32 => json!({"name": "int", "bitWidth": 32,
"isSigned": true}),
-&DataType::Int64 => json!({"name": "int", "bitWidth": 64,
"isSigned": true}),
-&DataType::UInt8 => json!({"name": "int", "bitWidth": 8,
"isSigned": false}),
-&DataType::UInt16 => json!({"name": "int", "bitWidth": 16,
"isSigned": false}),
-&DataType::UInt32 => json!({"name": "int", "bitWidth": 32,
"isSigned": false}),
-&DataType::UInt64 => json!({"name": "int", "bitWidth": 64,
"isSigned": false}),
-&DataType::Float16 => json!({"name": "floatingpoint", "precision":
"HALF"}),
-&DataType::Float32 => json!({"name": "floatingpoint", "precision":
"SINGLE"}),
-&DataType::Float64 => json!({"name": "floatingpoint", "precision":
"DOUBLE"}),
-&DataType::Utf8 => json!({"name": "utf8"}),
-&DataType::Struct(ref fields) => {
+match *self {
+DataType::Boolean => json!({"name": "bool"}),
+DataType::Int8 => json!({"name": "int", "bitWidth": 8, "isSigned":
true}),
+DataType::Int16 => json!({"name": "int", "bitWidth": 16,
"isSigned": true}),
+DataType::Int32 => json!({"name": "int", "bitWidth": 32,
"isSigned": true}),
+DataType::Int64 => json!({"name": "int", "bitWidth": 64,
"isSigned": true}),
+DataType::UInt8 => json!({"name": "int", "bitWidth": 8,
"isSigned": false}),
+DataType::UInt16 => json!({"name": "int", "bitWidth": 16,
"isSigned": false}),
+DataType::UInt32 => json!({"name": "int", "bitWidth": 32,
"isSigned": false}),
+DataType::UInt64 => json!({"name": "int", "bitWidth": 64,
"isSigned": false}),
+DataType::Float16 => json!({"name": "floatingpoint", "precision":
"HALF"}),
+DataType::Float32 => json!({"name": "floatingpoint", "precision":
"SINGLE"}),
+DataType::Float64 => json!({"name": "floatingpoint", "precision":
"DOUBLE"}),
+DataType::Utf8 => json!({"name": "utf8"}),
+DataType::Struct(ref fields) => {
let field_json_array =
Value::Array(fields.iter().map(|f|
f.to_json()).collect::>());
json!({ "fields": field_json_array })
@@ -147,8 +147,8 @@ impl Field {
pub fn from(json: &Value) -> Result {
//println!("Field::from({:?}", json);
-match json {
-&Value::Object(ref map) => {
+match *json {
+Value::Object(ref map) => {
let name = match map.get("name") {
Some(&Value::String(ref name)) => name.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] Fix using references in pattern matching
> ---
>
> Key: ARROW-2415
> URL: https://issues.apache.org/jira/browse/ARROW-2415
> Project: Apache Arrow
> Issue Type
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16430472#comment-16430472 ] ASF GitHub Bot commented on ARROW-2415: --- andygrove commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379739505 @pitrou :+1: yes please go ahead and merge 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16430391#comment-16430391 ] ASF GitHub Bot commented on ARROW-2415: --- pitrou commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379718659 Is this ok for merging? 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16430384#comment-16430384 ] ASF GitHub Bot commented on ARROW-2415: --- andygrove commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379717159 LGTM. I haven't been using clippy but will take a look. 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16430025#comment-16430025 ] ASF GitHub Bot commented on ARROW-2415: --- waywardmonkeys commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379630972 I will look into that this week and add it to my list of PRs to submit if necessary. 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16429971#comment-16429971 ] ASF GitHub Bot commented on ARROW-2415: --- maxim-lian commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379615789 Yes, I tend to agree. Potentially we could pin to a specific nightly, but maybe more trouble than it's worth. Any idea what other Rust projects do? CC @andygrove 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16429905#comment-16429905 ] ASF GitHub Bot commented on ARROW-2415: --- waywardmonkeys commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379589466 > Should we add a check in CI? Until clippy is part of rustup, I'm not sure. Since it is nightly only and sometimes it doesn't build for a day or two after compiler changes, it might introduce inconvenience. We could mention it somewhere though and encourage people to check? 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16429902#comment-16429902 ] ASF GitHub Bot commented on ARROW-2415: --- maxim-lian commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379588224 > it should be self.bits.is_empty() hopefully rather than self.len != 0 👍 > I'd planned to do subsequent things separately That's fine IMO. For the immediate fixes I don't think there's much ambiguity / need for discussion, but feel free to split up regardless. Should we add a check in CI? 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16429592#comment-16429592 ] ASF GitHub Bot commented on ARROW-2415: --- waywardmonkeys commented on issue #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851#issuecomment-379516182 I'd planned to do subsequent things separately ... there's already a separate issue + PR for the `format!` calls for example. That way, each set of changes is independent and handled separately if people disagree on the usefulness of a particular check. Note that when `is_empty` is implemented for `Bitmap`, it should be `self.bits.is_empty()` hopefully rather than `self.len != 0` ... but I had that queued up for a subsequent issue + PR. 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[
https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16429526#comment-16429526
]
ASF GitHub Bot commented on ARROW-2415:
---
maxim-lian commented on issue #1851: ARROW-2415: [Rust] Fix clippy
ref-match-pats warnings.
URL: https://github.com/apache/arrow/pull/1851#issuecomment-379492997
This is (almost) all the remainder of them:
```diff
diff --git a/rust/src/array.rs b/rust/src/array.rs
index 09f0c950..e6ee0241 100644
--- a/rust/src/array.rs
+++ b/rust/src/array.rs
@@ -93,6 +93,9 @@ impl Array {
pub fn len(&self) -> usize {
self.len as usize
}
+pub fn is_empty(&self) -> bool {
+self.len == 0
+}
}
macro_rules! array_from_primitive {
@@ -137,8 +140,8 @@ macro_rules! array_from_optional_primitive {
fn from(v: Vec>) -> Self {
let mut null_count = 0;
let mut validity_bitmap = Bitmap::new(v.len());
-for i in 0..v.len() {
-if v[i].is_none() {
+for (i, item) in v.iter().enumerate() {
+if item.is_none() {
null_count += 1;
validity_bitmap.clear(i);
}
@@ -192,7 +195,7 @@ impl From>> for Array {
len: v.len() as i32,
null_count: 0,
validity_bitmap: None,
-data: ArrayData::Struct(v.iter().map(|a| a.clone()).collect()),
+data: ArrayData::Struct(v.iter().cloned().collect()),
}
}
}
diff --git a/rust/src/bitmap.rs b/rust/src/bitmap.rs
index 59c65139..264feb4f 100644
--- a/rust/src/bitmap.rs
+++ b/rust/src/bitmap.rs
@@ -42,6 +42,9 @@ impl Bitmap {
pub fn len(&self) -> i32 {
self.bits.len()
}
+pub fn is_empty(&self) -> bool {
+self.len() == 0
+}
pub fn is_set(&self, i: usize) -> bool {
let byte_offset = i / 8;
diff --git a/rust/src/buffer.rs b/rust/src/buffer.rs
index 1f2ec6c8..a4907e61 100644
--- a/rust/src/buffer.rs
+++ b/rust/src/buffer.rs
@@ -38,6 +38,9 @@ impl Buffer {
self.len
}
+pub fn is_empty(&self) -> bool {
+self.len == 0
+}
pub fn data(&self) -> *const T {
self.data
}
@@ -166,6 +169,7 @@ mod tests {
fn test_buffer_i32() {
let b: Buffer = Buffer::from(vec![1, 2, 3, 4, 5]);
assert_eq!(5, b.len);
+assert_eq!(false, b.is_empty());
}
#[test]
diff --git a/rust/src/datatypes.rs b/rust/src/datatypes.rs
index ac2c2c6e..19e85321 100644
--- a/rust/src/datatypes.rs
+++ b/rust/src/datatypes.rs
@@ -40,17 +40,17 @@ pub enum DataType {
impl DataType {
fn from(json: &Value) -> Result {
//println!("DataType::from({:?})", json);
-match json {
-&Value::Object(ref map) => match map.get("name") {
+match *json {
+Value::Object(ref map) => match map.get("name") {
Some(s) if s == "bool" => Ok(DataType::Boolean),
Some(s) if s == "utf8" => Ok(DataType::Utf8),
Some(s) if s == "floatingpoint" => match
map.get("precision") {
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") {
@@ -59,13 +59,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"
-
[jira] [Commented] (ARROW-2415) [Rust] Fix using references in pattern matching
[ https://issues.apache.org/jira/browse/ARROW-2415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16429272#comment-16429272 ] ASF GitHub Bot commented on ARROW-2415: --- waywardmonkeys opened a new pull request #1851: ARROW-2415: [Rust] Fix clippy ref-match-pats warnings. URL: https://github.com/apache/arrow/pull/1851 It isn't necessary to use a reference in each pattern in a pattern match and it is more readable to just dereference the match value. 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] Fix using references in pattern matching > --- > > Key: ARROW-2415 > URL: https://issues.apache.org/jira/browse/ARROW-2415 > Project: Apache Arrow > Issue Type: Improvement > Components: Rust >Reporter: Bruce Mitchener >Priority: Major > Labels: pull-request-available > > Clippy reports > [https://rust-lang-nursery.github.io/rust-clippy/v0.0.191/index.html#match_ref_pats] > warnings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
