You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by al...@apache.org on 2022/07/21 20:33:15 UTC
[arrow-rs] branch master updated: Fix logical merge conflict (#2121)
This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
The following commit(s) were added to refs/heads/master by this push:
new db91031c2 Fix logical merge conflict (#2121)
db91031c2 is described below
commit db91031c2cd07f516f8118abf5477c33e0249e0a
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Thu Jul 21 16:33:10 2022 -0400
Fix logical merge conflict (#2121)
---
integration-testing/src/lib.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-testing/src/lib.rs b/integration-testing/src/lib.rs
index cd3033bbb..953427035 100644
--- a/integration-testing/src/lib.rs
+++ b/integration-testing/src/lib.rs
@@ -642,7 +642,7 @@ fn array_from_json(
.unwrap();
b.append_value(&decimal)
}
- _ => b.append_null(),
+ _ => Ok(b.append_null()),
}?;
}
Ok(Arc::new(b.finish()))