Rustup #3889

flip1995 · 2019-03-15T22:48:15Z

This is a WIP of the rustup to rust-lang/rust#58140. I'll try to continue working on this tomorrow. In the mean time everyone can pick this up if someone wants to :)

mati865

I was about to open another WIP Rustup RP and noticed this one.

clippy_lints/src/transmute.rs

clippy_lints/src/attrs.rs

clippy_lints/src/eta_reduction.rs

clippy_lints/src/utils/mod.rs

mati865 · 2019-03-16T00:13:42Z

cc @eddyb

clippy_lints/src/eta_reduction.rs

clippy_lints/src/utils/mod.rs

flip1995 · 2019-03-16T10:49:42Z

Ok thanks for the review everyone! Now I just have to fix the tests.

mati865 · 2019-03-17T00:14:51Z

Yet another breakage rust-lang/rust#58899

Very very WIP: mati865@d3447a2
I don't have time to work on this today.

EDIT2: Further WIP https://github.com/mati865/rust-clippy/tree/rustup

eddyb · 2019-03-18T07:12:28Z

clippy_lints/src/eta_reduction.rs

-fn match_borrow_depth(lhs: &ty::TyKind<'_>, rhs: &ty::TyKind<'_>) -> bool {
-    match (lhs, rhs) {
-        (ty::Ref(_, t1, _), ty::Ref(_, t2, _)) => match_borrow_depth(&t1.sty, &t2.sty),
+fn match_borrow_depth(lhs: ty::Ty<'_>, rhs: ty::Ty<'_>) -> bool {


You should import Ty and always refer to it unqualified - that's at least the rustc convention.

eddyb · 2019-03-18T07:13:19Z

clippy_lints/src/utils/mod.rs

-        ABSOLUTE
+use rustc::ty::print::Printer;
+
+#[allow(clippy::diverging_sub_expression)]


This sounds like a false positive - is an issue filled?

Not really a FP:
Since type Error = ! and we call let mut path = print_prefix(self)?;, the ? is a diverging sub-expression. IMO allowing this here is ok.

I disagree, ? with a diverging error path should not be warned against, the behavior is more like that of let Ok(mut path) = print_prefix(self);.

cc @Manishearth @oli-obk

eddyb · 2019-03-18T07:18:46Z

clippy_lints/src/utils/paths.rs

 pub const PARTIAL_ORD: [&str; 3] = ["core", "cmp", "PartialOrd"];
 pub const PATH: [&str; 3] = ["std", "path", "Path"];
 pub const PATH_BUF: [&str; 3] = ["std", "path", "PathBuf"];
-pub const PATH_TO_PATH_BUF: [&str; 4] = ["std", "path", "Path", "to_path_buf"];
+pub const PATH_TO_PATH_BUF: [&str; 2] = ["<std::path::Path>", "to_path_buf"];


These don't look good... That means path_qualified isn't quite right.

You want at least this, at the start of path_qualified:

if trait_ref.is_none() { if let ty::Adt(def, substs) = self_ty.sty { return self.print_def_path(def.did, substs); } }

Yeah that would be better. Should I also open a rustc PR to also change it there?

Where? rustdoc? Maybe, I don't know what that's used for (cc @QuietMisdreavus)

eddyb · 2019-03-18T07:20:29Z

clippy_lints/src/eta_reduction.rs

        (ty::Bool, ty::Bool)
        | (ty::Char, ty::Char)
        | (ty::Int(_), ty::Int(_))
        | (ty::Uint(_), ty::Uint(_))
        | (ty::Str, ty::Str) => true,
        (ty::Ref(_, t1, _), ty::Ref(_, t2, _))
        | (ty::Array(t1, _), ty::Array(t2, _))
-        | (ty::Slice(t1), ty::Slice(t2)) => match_types(&t1.sty, &t2.sty),
+        | (ty::Slice(t1), ty::Slice(t2)) => match_types(&t1, &t2),


&x.field, when x: &T, is &(*x).field, so when you want the whole thing instead of the field, you can write just x (&x happens to work, but it's because deref coercions stripping the &).

eddyb · 2019-03-18T07:20:59Z

clippy_lints/src/eta_reduction.rs

-fn match_types(lhs: &ty::TyKind<'_>, rhs: &ty::TyKind<'_>) -> bool {
-    match (lhs, rhs) {
+fn match_types(lhs: ty::Ty<'_>, rhs: ty::Ty<'_>) -> bool {
+    match (&lhs.sty, &rhs.sty) {


Also, random note, cc @Manishearth @oli-obk: this looks like it could use the ty::relate infrastructure.

flip1995 · 2019-03-18T08:13:15Z

Thanks for the review! I won't be able to get to this until this evening. @mati865 if you want to open a new rustup PR based on this, feel free to do so!

mati865 · 2019-03-18T12:11:21Z

New PR: #3893

Rustup Supersedes #3889 Addresses some review comments from previous PR and rustups to rust-lang/rust#58899

flip1995 added 3 commits March 15, 2019 23:42

Reimplement AbsolutePathBuffer

31435cd

item_path_str -> def_path_str

dcbd3ae

parent_def_id -> parent

8eadbfd

flip1995 added E-help-wanted Call for participation: Help is requested to fix this issue. S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Mar 15, 2019

mati865 reviewed Mar 16, 2019

View reviewed changes

clippy_lints/src/transmute.rs Outdated Show resolved Hide resolved

clippy_lints/src/attrs.rs Show resolved Hide resolved

clippy_lints/src/eta_reduction.rs Outdated Show resolved Hide resolved

clippy_lints/src/utils/mod.rs Outdated Show resolved Hide resolved

eddyb reviewed Mar 16, 2019

View reviewed changes

clippy_lints/src/eta_reduction.rs Outdated Show resolved Hide resolved

eddyb reviewed Mar 16, 2019

View reviewed changes

clippy_lints/src/utils/mod.rs Outdated Show resolved Hide resolved

eddyb reviewed Mar 16, 2019

View reviewed changes

clippy_lints/src/utils/mod.rs Show resolved Hide resolved

Remove ty::TyKind from eta_reduction and replace it with ty::Ty

2d8618e

flip1995 force-pushed the rustup branch from f66374d to 2d8618e Compare March 16, 2019 10:14

flip1995 added 2 commits March 16, 2019 11:17

AbsolutePathBuffer -> AbsolutePathPrinter

dae5c9c

Use LocalInternedString inside of AbsolutePathPrinter

254fad9

flip1995 added 3 commits March 16, 2019 11:51

cargo fmt

3c4616d

Adapt paths to new formatting

180e07e

Feed dog

4832a85

flip1995 marked this pull request as ready for review March 16, 2019 14:39

eddyb reviewed Mar 18, 2019

View reviewed changes

mati865 mentioned this pull request Mar 18, 2019

Rustup #3893

Merged

bors added a commit that referenced this pull request Mar 18, 2019

Auto merge of #3893 - mati865:rustup, r=oli-obk

4895097

Rustup Supersedes #3889 Addresses some review comments from previous PR and rustups to rust-lang/rust#58899

bors added a commit that referenced this pull request Mar 18, 2019

Auto merge of #3893 - mati865:rustup, r=oli-obk

a7e0c0b

Rustup Supersedes #3889 Addresses some review comments from previous PR and rustups to rust-lang/rust#58899

bors added a commit that referenced this pull request Mar 18, 2019

Auto merge of #3893 - mati865:rustup, r=oli-obk

849ac1d

Rustup Supersedes #3889 Addresses some review comments from previous PR and rustups to rust-lang/rust#58899

flip1995 closed this Mar 18, 2019

flip1995 deleted the rustup branch March 18, 2019 13:34

bors added a commit that referenced this pull request Mar 18, 2019

Auto merge of #3893 - mati865:rustup, r=oli-obk

6a0a197

Rustup Supersedes #3889 Addresses some review comments from previous PR and rustups to rust-lang/rust#58899

bors added a commit that referenced this pull request Mar 18, 2019

Auto merge of #3893 - mati865:rustup, r=oli-obk

92612c9

Rustup Supersedes #3889 Addresses some review comments from previous PR and rustups to rust-lang/rust#58899

flip1995 mentioned this pull request Mar 24, 2019

trait bounds lint - repeated types #3766

Merged

Rustup #3889

Rustup #3889

Uh oh!

Conversation

flip1995 commented Mar 15, 2019

Uh oh!

mati865 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mati865 commented Mar 16, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

flip1995 commented Mar 16, 2019

Uh oh!

mati865 commented Mar 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

flip1995 commented Mar 18, 2019

Uh oh!

mati865 commented Mar 18, 2019

Uh oh!

Uh oh!

mati865 commented Mar 17, 2019 •

edited

Loading