[rust 2021] migrate to rust 2021 #1159

PsiACE · 2021-07-22T08:52:25Z

Signed-off-by: Chojan Shang psiace@outlook.com

I hereby agree to the terms of the CLA available at: https://datafuse.rs/policies/cla/

Summary

Migrate to rust 2021

cargo fmt fails with error "Invalid value for `--edition`", see:

Changelog

Improvement
Build/Testing/CI

Related Issues

Fixes #1149

Test Plan

Unit Tests

Stateless Tests

Signed-off-by: Chojan Shang <psiace@outlook.com>

databend-bot · 2021-07-22T08:52:29Z

Thanks for the contribution!
I have applied any labels matching special text in your PR Changelog.

Please review the labels and make any necessary changes.

BohuTANG · 2021-07-22T08:53:57Z

common/datablocks/src/kernels/data_block_sort.rs

@@ -87,7 +87,10 @@ impl DataBlock {
            .columns()
            .iter()
            .zip(rhs.columns().iter())
-            .map(|(a, b)| DataColumnCommon::merge_columns(a, b, indices))
+            .map(|(a, b)| {
+                let _ = &indices;


This line used for?

This line used for?

see https://doc.rust-lang.org/nightly/edition-guide/rust-2021/disjoint-capture-in-closures.html

Auto gen by cargo fix. This is a conservative analysis: in many cases, these dummy lets can be safely removed and your program will work fine.

It doesn't look like a good style : (

Maybe we can do it with macros? similar to '[&captures_var] (args) {} in C++`.

Maybe we can do it with macros? similar to '[&captures_var] (args) {} in C++`.

We can try to remove these dummy let manually. If it is really necessary, consider other options.

sundy-li · 2021-07-22T08:55:58Z

common/datavalues/src/arrays/kernels/take.rs

-        .map(|opt_idx| opt_idx.map(|idx| *array_values.get_unchecked(idx)));
+    let iter = indices.into_iter().map(|opt_idx| {
+        opt_idx.map(|idx| {
+            let _ = &array_values;


Why rust 2021 turns to be more complicated.

Why rust 2021 turns to be more complicated.

I don't think it becomes more complicated.

This is a conservative analysis: in many cases, these dummy lets can be safely removed and your program will work fine.

Starting in Rust 2021, closures captures are more precise. Typically they will only capture the fields they use (in some cases, they might capture more than just what they use, see the Rust reference for full details).

PsiACE · 2021-07-22T09:05:52Z

We can try to adjust these codes later. Just announcing that we are moving towards Rust 2021.

ariesdevil · 2021-07-22T09:13:46Z

Since the Rust official says:

Note that Rust 2021 is still unstable, so you can expect bugs and other changes! We recommend migrating your crates in a temporary copy of your code versus your main branch. If you do encounter problems, or find areas where quality could be improved (missing documentation, confusing error messages, etc) please file an issue and tell us about it! Thank you!

We'd better make this PR commit to an independent branch likes rust-2021 instead of direct to master.
@PsiACE

PsiACE · 2021-07-22T09:16:09Z

We'd better make this PR commit to an independent branch likes rust-2021 instead of direct to master.

Okay, thanks.

codecov-commenter · 2021-07-22T10:19:07Z

Codecov Report

Merging #1159 (a694e36) into master (62603da) will decrease coverage by 11%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master   #1159      +/-   ##
=========================================
- Coverage      71%     59%     -12%     
=========================================
  Files         446       6     -440     
  Lines       26330      96   -26234     
=========================================
- Hits        18714      57   -18657     
+ Misses       7616      39    -7577

Impacted Files	Coverage Δ
common/management/src/user/user_api.rs	`0% <0%> (-80%)`	⬇️
common/management/src/user/utils.rs	`0% <0%> (-76%)`	⬇️
common/progress/src/progress.rs	`54% <0%> (-25%)`	⬇️
fusequery/query/src/api/rpc/flight_actions.rs
fusequery/query/src/interpreters/interpreter.rs
common/infallible/src/rwlock_test.rs
common/datavalues/src/series/comparison.rs
fusestore/store/src/executor/action_handler.rs
common/functions/src/scalars/udfs/exists.rs
fusestore/store/src/localfs/local_fs_test.rs
... and 410 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 62603da...a694e36. Read the comment docs.

BohuTANG · 2021-07-23T00:48:37Z

Since the Rust official says:

Note that Rust 2021 is still unstable, so you can expect bugs and other changes! We recommend migrating your crates in a temporary copy of your code versus your main branch. If you do encounter problems, or find areas where quality could be improved (missing documentation, confusing error messages, etc) please file an issue and tell us about it! Thank you!

We'd better make this PR commit to an independent branch likes rust-2021 instead of direct to master.
@PsiACE

If there are no major problems, merging to the maater branch is ok, we also want to help Rust 2021 mature faster, not simply testing, and Rust 2021 nightly will be released soon.
cc @PsiACE @ariesdevil

PsiACE · 2021-07-23T01:05:09Z

If there are no major problems, merging to the maater branch is ok, we also want to help Rust 2021 mature faster, not simply testing, and Rust 2021 nightly will be released soon.

There seems to be no problem, I will check if there is some room for improvement, and then merge before next Wednesday.

Signed-off-by: Chojan Shang <psiace@outlook.com>

…o rust-2021

Signed-off-by: Chojan Shang <psiace@outlook.com>

databend-bot · 2021-07-29T05:23:24Z

Hello @PsiACE, 🎉 Thank you for opening the pull request! 🎉
Your pull request state is not in Draft, please add Reviewers or Re-request review again!
FuseQuery: @BohuTANG @sundy-li @zhang2014
FuseStore: @drmingdrmer @dantengsky
Or visit datafuse roadmap for some clues.

PsiACE · 2021-07-29T05:33:44Z

Finally, I removed all useless dummy lets. I think we can announce a successful migration to Rust 2021. The only regret is that the cargo fmt is temporarily invalid.

BohuTANG · 2021-07-29T05:35:47Z

Finally, I removed all useless dummy lets. I think we can announce a successful migration to Rust 2021. The only regret is that the cargo format is temporarily invalid.

Great, waiting for rust-lang/rust#87468 to merge.

BohuTANG · 2021-08-02T23:43:16Z

Finally, I removed all useless dummy lets. I think we can announce a successful migration to Rust 2021. The only regret is that the cargo format is temporarily invalid.

Great, waiting for rust-lang/rust#87468 to merge.

87468 has merged, we could start this task again.
cc @PsiACE

PsiACE · 2021-08-02T23:59:26Z

87468 has merged, we could start this task again.
cc @PsiACE

Yes, but we still need to wait for the new nightly version. This PR may be completed later today.

Signed-off-by: Chojan Shang <psiace@outlook.com>

PsiACE · 2021-08-03T12:19:11Z

@BohuTANG Done. Once merged, we will enter the era of Rust 2021.

BohuTANG

Looks great to me!

databend-bot · 2021-08-03T12:25:04Z

CI Passed
Reviewer Approved
Let's Merge

[rust 2021] migrate to rust 2021

3bd1fa8

Signed-off-by: Chojan Shang <psiace@outlook.com>

databend-bot added pr-build this PR changes build/testing/ci steps pr-improvement labels Jul 22, 2021

BohuTANG reviewed Jul 22, 2021

View reviewed changes

sundy-li reviewed Jul 22, 2021

View reviewed changes

PsiACE changed the base branch from master to rust-2021 July 22, 2021 09:15

PsiACE added 2 commits July 26, 2021 08:58

[merge] sync with the master branch

e66ff02

Signed-off-by: Chojan Shang <psiace@outlook.com>

[fix] sync plan parser

a694e36

Signed-off-by: Chojan Shang <psiace@outlook.com>

PsiACE changed the base branch from rust-2021 to master July 26, 2021 02:07

PsiACE added 4 commits July 29, 2021 12:51

[improve] remove dummy lets

6de4d09

Signed-off-by: Chojan Shang <psiace@outlook.com>

[ci] disable format check

15a8125

Signed-off-by: Chojan Shang <psiace@outlook.com>

Merge branch 'master' of https://github.com/datafuselabs/datafuse int…

2cc09d1

…o rust-2021

[rust 2021] common/io

7985114

Signed-off-by: Chojan Shang <psiace@outlook.com>

PsiACE marked this pull request as ready for review July 29, 2021 05:23

PsiACE added 3 commits August 3, 2021 15:48

[ci/toolchain] enable rustfmt

549c68d

Signed-off-by: Chojan Shang <psiace@outlook.com>

Merge branch 'master' of github.com:datafuselabs/datafuse into rust-2021

ba5c26d

[rust 2021] common/stoppable & fusecli

79ee4a5

Signed-off-by: Chojan Shang <psiace@outlook.com>

PsiACE requested a review from BohuTANG August 3, 2021 10:30

BohuTANG approved these changes Aug 3, 2021

View reviewed changes

databend-bot merged commit db62e1e into databendlabs:master Aug 3, 2021

PsiACE deleted the rust-2021 branch August 3, 2021 13:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[rust 2021] migrate to rust 2021 #1159

[rust 2021] migrate to rust 2021 #1159

PsiACE commented Jul 22, 2021 •

edited

Loading

databend-bot commented Jul 22, 2021

BohuTANG Jul 22, 2021

PsiACE Jul 22, 2021

zhang2014 Jul 22, 2021

zhang2014 Jul 22, 2021 •

edited

Loading

PsiACE Jul 22, 2021

sundy-li Jul 22, 2021 •

edited

Loading

BohuTANG Jul 22, 2021

PsiACE Jul 22, 2021

PsiACE commented Jul 22, 2021

ariesdevil commented Jul 22, 2021

PsiACE commented Jul 22, 2021

codecov-commenter commented Jul 22, 2021 •

edited

Loading

BohuTANG commented Jul 23, 2021 •

edited

Loading

PsiACE commented Jul 23, 2021

databend-bot commented Jul 29, 2021

PsiACE commented Jul 29, 2021 •

edited

Loading

BohuTANG commented Jul 29, 2021

BohuTANG commented Aug 2, 2021

PsiACE commented Aug 2, 2021

PsiACE commented Aug 3, 2021

BohuTANG left a comment

databend-bot commented Aug 3, 2021

[rust 2021] migrate to rust 2021 #1159

[rust 2021] migrate to rust 2021 #1159

Conversation

PsiACE commented Jul 22, 2021 • edited Loading

Summary

Changelog

Related Issues

Test Plan

databend-bot commented Jul 22, 2021

BohuTANG Jul 22, 2021

Choose a reason for hiding this comment

PsiACE Jul 22, 2021

Choose a reason for hiding this comment

zhang2014 Jul 22, 2021

Choose a reason for hiding this comment

zhang2014 Jul 22, 2021 • edited Loading

Choose a reason for hiding this comment

PsiACE Jul 22, 2021

Choose a reason for hiding this comment

sundy-li Jul 22, 2021 • edited Loading

Choose a reason for hiding this comment

BohuTANG Jul 22, 2021

Choose a reason for hiding this comment

PsiACE Jul 22, 2021

Choose a reason for hiding this comment

PsiACE commented Jul 22, 2021

ariesdevil commented Jul 22, 2021

PsiACE commented Jul 22, 2021

codecov-commenter commented Jul 22, 2021 • edited Loading

Codecov Report

BohuTANG commented Jul 23, 2021 • edited Loading

PsiACE commented Jul 23, 2021

databend-bot commented Jul 29, 2021

PsiACE commented Jul 29, 2021 • edited Loading

BohuTANG commented Jul 29, 2021

BohuTANG commented Aug 2, 2021

PsiACE commented Aug 2, 2021

PsiACE commented Aug 3, 2021

BohuTANG left a comment

Choose a reason for hiding this comment

databend-bot commented Aug 3, 2021

PsiACE commented Jul 22, 2021 •

edited

Loading

zhang2014 Jul 22, 2021 •

edited

Loading

sundy-li Jul 22, 2021 •

edited

Loading

codecov-commenter commented Jul 22, 2021 •

edited

Loading

BohuTANG commented Jul 23, 2021 •

edited

Loading

PsiACE commented Jul 29, 2021 •

edited

Loading