Skip to content

Update clippy in preperation for #62150#62246

Closed
alex wants to merge 1 commit intorust-lang:masterfrom
alex:bump-clippy
Closed

Update clippy in preperation for #62150#62246
alex wants to merge 1 commit intorust-lang:masterfrom
alex:bump-clippy

Conversation

@alex
Copy link
Member

@alex alex commented Jun 30, 2019

No description provided.

@rust-highfive
Copy link
Contributor

rust-highfive commented Jun 30, 2019

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Contributor

rust-highfive commented Jun 30, 2019

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2019
@alex alex mentioned this pull request Jun 30, 2019
Merged
@Centril
Copy link
Contributor

Centril commented Jun 30, 2019

r? @Centril @bors r+

@bors
Copy link
Collaborator

bors commented Jun 30, 2019

📌 Commit 9debf2f has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 30, 2019
@RalfJung
Copy link
Member

RalfJung commented Jul 4, 2019

@bors p=1
tool update

@bors
Copy link
Collaborator

bors commented Jul 4, 2019

⌛ Testing commit 9debf2f with merge c018407bf09d2aa1f41616e440ba7a910af4ab9d...

@bors
Copy link
Collaborator

bors commented Jul 4, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 4, 2019
@alex
Copy link
Member Author

alex commented Jul 4, 2019

Build failure was due to failing to build miri, seems unrelated to this PR?

@RalfJung
Copy link
Member

RalfJung commented Jul 4, 2019

Miri also failed, but it does not seem to be the only thing that did:

We detected that this PR updated 'clippy-driver', but its tests failed.

   Compiling‌ clippy_lints v0.0.212 (/checkout/src/tools/clippy/clippy_lints)‌
error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:105:80‌
    ‌|‌
105‌ ‌| ‌                !self.ignore_fn && self.eq_expr(l_fun, r_fun) && self.eq_exprs(l_args, r_args)‌
    ‌| ‌                                                                               ‌^^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:105:88‌
    ‌|‌
105‌ ‌| ‌                !self.ignore_fn && self.eq_expr(l_fun, r_fun) && self.eq_exprs(l_args, r_args)‌
    ‌| ‌                                                                                       ‌^^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:131:90‌
    ‌|‌
131‌ ‌| ‌                !self.ignore_fn && self.eq_path_segment(l_path, r_path) && self.eq_exprs(l_args, r_args)‌
    ‌| ‌                                                                                         ‌^^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:131:98‌
    ‌|‌
131‌ ‌| ‌                !self.ignore_fn && self.eq_path_segment(l_path, r_path) && self.eq_exprs(l_args, r_args)‌
    ‌| ‌                                                                                                 ‌^^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:148:85‌
    ‌|‌
148‌ ‌| ‌            (&ExprKind::Tup(ref l_tup), &ExprKind::Tup(ref r_tup)) => self.eq_exprs(l_tup, r_tup),‌
    ‌| ‌                                                                                    ‌^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:148:92‌
    ‌|‌
148‌ ‌| ‌            (&ExprKind::Tup(ref l_tup), &ExprKind::Tup(ref r_tup)) => self.eq_exprs(l_tup, r_tup),‌
    ‌| ‌                                                                                           ‌^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:150:81‌
    ‌|‌
150‌ ‌| ‌            (&ExprKind::Array(ref l), &ExprKind::Array(ref r)) => self.eq_exprs(l, r),‌
    ‌| ‌                                                                                ‌^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:150:84‌
    ‌|‌
150‌ ‌| ‌            (&ExprKind::Array(ref l), &ExprKind::Array(ref r)) => self.eq_exprs(l, r),‌
    ‌| ‌                                                                                   ‌^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:444:33‌
    ‌|‌
444‌ ‌| ‌                self.hash_exprs(args);‌
    ‌| ‌                                ‌^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:491:33‌
    ‌|‌
491‌ ‌| ‌                self.hash_exprs(args);‌
    ‌| ‌                                ‌^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:521:33‌
    ‌|‌
521‌ ‌| ‌                self.hash_exprs(v);‌
    ‌| ‌                                ‌^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
               found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
  ‌--> ‌src/tools/clippy/clippy_lints/src/panic_unimplemented.rs:63:33‌
   ‌|‌
63‌ ‌| ‌                    match_panic(params, expr, cx);‌
   ‌| ‌                                ‌^^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
   ‌|‌
   ‌= ‌note‌: expected type `‌&syntax::ptr::P<[rustc::hir::Expr]>‌`‌
              found type `‌&rustc::hir::ptr::P<[rustc::hir::Expr]>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/question_mark.rs:142:29‌
    ‌|‌
142‌ ‌| ‌                return Some(ret_expr);‌
    ‌| ‌                            ‌^^^^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<rustc::hir::Expr>‌`‌
               found type `‌&rustc::hir::ptr::P<rustc::hir::Expr>‌`‌

error[E0308]‌: mismatched types‌
   ‌--> ‌src/tools/clippy/clippy_lints/src/question_mark.rs:151:29‌
    ‌|‌
151‌ ‌| ‌                return Some(ret_expr);‌
    ‌| ‌                            ‌^^^^^^^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
    ‌|‌
    ‌= ‌note‌: expected type `‌&syntax::ptr::P<rustc::hir::Expr>‌`‌
               found type `‌&rustc::hir::ptr::P<rustc::hir::Expr>‌`‌

error[E0308]‌: mismatched types‌
  ‌--> ‌src/tools/clippy/clippy_lints/src/redundant_pattern_matching.rs:51:70‌
   ‌|‌
51‌ ‌| ‌                MatchSource::Normal => find_sugg_for_match(cx, expr, op, arms),‌
   ‌| ‌                                                                     ‌^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
   ‌|‌
   ‌= ‌note‌: expected type `‌&syntax::ptr::P<rustc::hir::Expr>‌`‌
              found type `‌&rustc::hir::ptr::P<rustc::hir::Expr>‌`‌

error[E0308]‌: mismatched types‌
  ‌--> ‌src/tools/clippy/clippy_lints/src/redundant_pattern_matching.rs:52:84‌
   ‌|‌
52‌ ‌| ‌                MatchSource::IfLetDesugar { .. } => find_sugg_for_if_let(cx, expr, op, arms),‌
   ‌| ‌                                                                                   ‌^^‌ ‌expected struct `syntax::ptr::P`, found struct `rustc::hir::ptr::P`‌
   ‌|‌
   ‌= ‌note‌: expected type `‌&syntax::ptr::P<rustc::hir::Expr>‌`‌
              found type `‌&rustc::hir::ptr::P<rustc::hir::Expr>‌`‌

error‌: aborting due to 16 previous errors‌

For more information about this error, try `rustc --explain E0308`.‌
error:‌ Could not compile `clippy_lints`.‌
warning:‌ build failed, waiting for other jobs to finish...‌
[RUSTC-TIMING] cargo_metadata test:false 23.427

With #61995, clippy is broken in master already, and anyway someone will need to first update it upstream and then propagate the fix. That will also propagate your change.

So my recommendation is to just close this PR.

@alex
Copy link
Member Author

alex commented Jul 4, 2019

Makes sense to me, thanks!

@alex alex closed this Jul 4, 2019
@alex alex deleted the bump-clippy branch July 4, 2019 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Centril Centril

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@alex @rust-highfive @Centril @bors @RalfJung @alexcrichton