Rustup to rustc 1.41.0-nightly (e87a205c2 2019-11-27) #4846

flip1995 · 2019-11-25T12:58:11Z

Rustups:

Ast address-of rust#66671 (Ast address-of)
Scope format! temporaries rust#64856 (Scope format! temporaries)
http://github.com/rust-lang/rust/pull/66719

changelog: none

flip1995 · 2019-11-25T13:01:23Z

tests/ui/or_fun_call.stderr

-error: use of `ok_or` followed by a function call
-  --> $DIR/or_fun_call.rs:74:17
-   |
-LL |     let _ = opt.ok_or(format!("{} world.", hello));
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `ok_or_else(|| format!("{} world.", hello))`


format! now expands to a block. While format is explicitly handled in expect_fun_call, it is not in or_fun_call.

Centril · 2019-11-25T22:23:10Z

rust-lang/rust#66671 (Ast address-of)

cc @matthewjasper -- simply doing _ on the BorrowKind might give wrong linting behaviors depending on the lint. You might want to be more conservative and match on ::Ref initially.

flip1995 · 2019-11-26T13:48:59Z

Ah thanks, good point!

matthewjasper

I've commented in the places that should not be using BorrowKind::Ref

matthewjasper · 2019-11-26T19:00:56Z

clippy_lints/src/eval_order_dependence.rs

@@ -328,7 +328,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ReadVisitor<'a, 'tcx> {
            // ```
            //
            // TODO: fix this
-            ExprKind::AddrOf(_, _) => {
+            ExprKind::AddrOf(_, _, _) => {


This can stay

matthewjasper · 2019-11-26T19:01:22Z

clippy_lints/src/functions.rs

@@ -656,7 +656,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for StaticMutVisitor<'a, 'tcx> {
                    tys.clear();
                }
            },
-            Assign(ref target, _) | AssignOp(_, ref target, _) | AddrOf(hir::Mutability::Mutable, ref target) => {
+            Assign(ref target, _) | AssignOp(_, ref target, _) | AddrOf(_, hir::Mutability::Mutable, ref target) => {


This can stay

matthewjasper · 2019-11-26T19:24:01Z

clippy_lints/src/mutable_debug_assertion.rs

@@ -77,14 +77,14 @@ fn extract_call<'a, 'tcx>(cx: &'a LateContext<'a, 'tcx>, e: &'tcx Expr) -> Optio
                        if let ExprKind::Tup(ref conditions) = headerexpr.kind;
                        if conditions.len() == 2;
                        then {
-                            if let ExprKind::AddrOf(_, ref lhs) = conditions[0].kind {
+                            if let ExprKind::AddrOf(_, _, ref lhs) = conditions[0].kind {


Maybe the ones in this file?

eh, i think this is edge casey enough to leave it focused on Ref.

matthewjasper · 2019-11-26T19:24:38Z

clippy_lints/src/no_effect.rs

@@ -58,7 +58,7 @@ fn has_no_effect(cx: &LateContext<'_, '_>, expr: &Expr) -> bool {
        | ExprKind::Type(ref inner, _)
        | ExprKind::Unary(_, ref inner)
        | ExprKind::Field(ref inner, _)
-        | ExprKind::AddrOf(_, ref inner)
+        | ExprKind::AddrOf(_, _, ref inner)


The ones in this file

matthewjasper · 2019-11-26T19:25:08Z

clippy_lints/src/reference.rs

@@ -37,7 +37,7 @@ impl EarlyLintPass for DerefAddrOf {
    fn check_expr(&mut self, cx: &EarlyContext<'_>, e: &Expr) {
        if_chain! {
            if let ExprKind::Unary(UnOp::Deref, ref deref_target) = e.kind;
-            if let ExprKind::AddrOf(_, ref addrof_target) = without_parens(deref_target).kind;
+            if let ExprKind::AddrOf(_, _, ref addrof_target) = without_parens(deref_target).kind;


The ones in this file

matthewjasper · 2019-11-26T19:27:19Z

clippy_lints/src/shadow.rs

-        },
+        ExprKind::Unary(_, ref e)
+        | ExprKind::Field(ref e, _)
+        | ExprKind::AddrOf(_, _, ref e)


The ones in this file

matthewjasper · 2019-11-26T19:29:54Z

clippy_lints/src/utils/hir_utils.rs

@@ -78,7 +78,7 @@ impl<'a, 'tcx> SpanlessEq<'a, 'tcx> {
        }

        match (&left.kind, &right.kind) {
-            (&ExprKind::AddrOf(l_mut, ref le), &ExprKind::AddrOf(r_mut, ref re)) => {
+            (&ExprKind::AddrOf(_, l_mut, ref le), &ExprKind::AddrOf(_, r_mut, ref re)) => {


This should compare the BorrowKinds

matthewjasper · 2019-11-26T19:30:15Z

clippy_lints/src/utils/hir_utils.rs

@@ -398,7 +398,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
        std::mem::discriminant(&e.kind).hash(&mut self.s);

        match e.kind {
-            ExprKind::AddrOf(m, ref e) => {
+            ExprKind::AddrOf(_, m, ref e) => {


This should hash the BorrowKind

matthewjasper · 2019-11-26T19:32:02Z

clippy_lints/src/utils/inspector.rs

@@ -264,7 +264,7 @@ fn print_expr(cx: &LateContext<'_, '_>, expr: &hir::Expr, indent: usize) {
            println!("{}Relative Path, {:?}", ind, ty);
            println!("{}seg: {:?}", ind, seg);
        },
-        hir::ExprKind::AddrOf(ref muta, ref e) => {
+        hir::ExprKind::AddrOf(_, ref muta, ref e) => {


This should print out the BorrowKind

Manishearth · 2019-11-27T22:48:28Z

Updated, added some more fixes

@bors r+

bors · 2019-11-27T22:48:30Z

📌 Commit ef05061 has been approved by Manishearth

bors · 2019-11-27T22:48:36Z

⌛ Testing commit ef05061 with merge ff930d3...

Rustup Rustups: - rust-lang/rust#66671 (Ast address-of) - rust-lang/rust#64856 (Scope format! temporaries) changelog: none

bors · 2019-11-27T22:49:12Z

💔 Test failed - status-appveyor

Manishearth · 2019-11-27T22:52:11Z

@bors r+

bors · 2019-11-27T22:52:13Z

📌 Commit 9aa58ed has been approved by Manishearth

bors · 2019-11-27T22:52:19Z

⌛ Testing commit 9aa58ed with merge a3da0fb...

Rustup to rustc 1.41.0-nightly (e87a205 2019-11-27) Rustups: - rust-lang/rust#66671 (Ast address-of) - rust-lang/rust#64856 (Scope format! temporaries) - http://github.com/rust-lang/rust/pull/66719 changelog: none

bors · 2019-11-27T23:01:01Z

💔 Test failed - status-appveyor

From http://github.com/rust-lang/rust/pull/66719

Manishearth · 2019-11-27T23:09:57Z

@bors r+

bors · 2019-11-27T23:09:58Z

📌 Commit 40c91ec has been approved by Manishearth

bors · 2019-11-27T23:10:06Z

⌛ Testing commit 40c91ec with merge 7b8e829...

Rustup to rustc 1.41.0-nightly (e87a205 2019-11-27) Rustups: - rust-lang/rust#66671 (Ast address-of) - rust-lang/rust#64856 (Scope format! temporaries) - http://github.com/rust-lang/rust/pull/66719 changelog: none

bors · 2019-11-27T23:28:32Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing 7b8e829 to master...

flip1995 · 2019-11-28T14:27:10Z

Thanks! Hadn't had access to my dev machine the last 2 days!

flip1995 added 2 commits November 25, 2019 13:18

Rustup to rust-lang/rust#66671

d43c424

Rustup to rust-lang/rust#64856

d2d62de

flip1995 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Nov 25, 2019

flip1995 commented Nov 25, 2019

View reviewed changes

Run rustfmt

6eeac46

flip1995 mentioned this pull request Nov 25, 2019

Added restriction lint: pattern-type-mismatch #4841

Merged

matthewjasper reviewed Nov 26, 2019

View reviewed changes

Add BorrowKind::Ref

341e266

bors added a commit that referenced this pull request Nov 27, 2019

Auto merge of #4846 - flip1995:rustup, r=Manishearth

ff930d3

Rustup Rustups: - rust-lang/rust#66671 (Ast address-of) - rust-lang/rust#64856 (Scope format! temporaries) changelog: none

Manishearth force-pushed the rustup branch from ef05061 to 9aa58ed Compare November 27, 2019 22:51

Manishearth changed the title ~~Rustup~~ Rustup to rustc 1.41.0-nightly (e87a205c2 2019-11-27) Nov 27, 2019

Manishearth added 4 commits November 27, 2019 15:09

Re-add wildcards for BorrowKind in some places

3430bc1

More borrowkind fixes

e381143

Add blank stderr file for cant_be_const test

7364648

config.usize_ty -> config.ptr_width

40c91ec

From http://github.com/rust-lang/rust/pull/66719

Manishearth force-pushed the rustup branch from 9aa58ed to 40c91ec Compare November 27, 2019 23:09

bors merged commit 40c91ec into rust-lang:master Nov 27, 2019

flip1995 deleted the rustup branch November 28, 2019 14:26

Rustup to rustc 1.41.0-nightly (e87a205c2 2019-11-27) #4846

Rustup to rustc 1.41.0-nightly (e87a205c2 2019-11-27) #4846

Uh oh!

Conversation

flip1995 commented Nov 25, 2019 • edited by Manishearth 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!

Centril commented Nov 25, 2019

Uh oh!

flip1995 commented Nov 26, 2019

Uh oh!

matthewjasper left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Manishearth commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

Manishearth commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

Manishearth commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

bors commented Nov 27, 2019

Uh oh!

flip1995 commented Nov 28, 2019

Uh oh!

Uh oh!

flip1995 commented Nov 25, 2019 •

edited by Manishearth

Loading

matthewjasper left a comment •

edited

Loading