Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix logical merge conflict: match arms have incompatible types #2121

merged 1 commit into from Jul 21, 2022


Copy link

@alamb alamb commented Jul 21, 2022

Fix build on master

I merged #2094 which had a logical conflict which results in a build failure on master such as

   Compiling arrow-integration-testing v18.0.0 (/__w/arrow-rs/arrow-rs/integration-testing)
error[E0308]: `match` arms have incompatible types
   --> integration-testing/src/
628 | /                 match is_valid {
629 | |                     1 => {
630 | |                         let str = value.as_str().unwrap();
631 | |                         let integer = BigInt::parse_bytes(str.as_bytes(), 10).unwrap();
...   |
643 | |                         b.append_value(&decimal)
    | |                         ------------------------ this is found to be of type `std::result::Result<(), ArrowError>`
644 | |                     }
645 | |                     _ => b.append_null(),
    | |                          ^^^^^^^^^^^^^^^ expected enum `std::result::Result`, found `()`
646 | |                 }?;
    | |_________________- `match` arms have incompatible types
    = note:   expected enum `std::result::Result<(), ArrowError>`
            found unit type `()`

@alamb alamb changed the title Fix logical merge conflict Fix logical merge conflict: match arms have incompatible types Jul 21, 2022
@alamb alamb requested a review from viirya July 21, 2022 20:16
@alamb alamb marked this pull request as ready for review July 21, 2022 20:16
Copy link
Contributor Author

alamb commented Jul 21, 2022

I plan to merge this PR once the build step passes

@alamb alamb merged commit db91031 into apache:master Jul 21, 2022
17 of 18 checks passed
@alamb alamb deleted the alamb/fix_conflict branch July 21, 2022 20:33
Copy link

ursabot commented Jul 21, 2022

Benchmark runs are scheduled for baseline = 1805b30 and contender = db91031. db91031 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

@alamb alamb mentioned this pull request Jul 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet

Successfully merging this pull request may close these issues.

None yet

4 participants