Rollup of 10 pull requests by JohnTitor · Pull Request #69724 · rust-lang/rust

JohnTitor · 2020-03-05T04:11:31Z

Successful merges:

Make error message clearer about creating new module #69520 (Make error message clearer about creating new module)
ast: Mac/Macro -> MacCall #69589 (ast: Mac/Macro -> MacCall)
delay_span_bug when codegen cannot select obligation #69614 (delay_span_bug when codegen cannot select obligation)
Update books #69641 (Update books)
Rename DefKind::Method and TraitItemKind::Method #69674 (Rename DefKind::Method and TraitItemKind::Method )
Add explanation for E0380 #69697 (Add explanation for E0380)
Use associated constants of integer types #69698 (Use associated constants of integer types)
Toolstate: remove redundant beta-week check. #69705 (Toolstate: remove redundant beta-week check.)
Update macros.rs: fix documentation typo. #69711 (Update macros.rs: fix documentation typo.)
more clippy cleanups #69713 (more clippy cleanups)

Failed merges:

Fix rust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

The Result can be expect-unwrapped directly. (clippy::ok_expect)

…x| Some(y)) (clippy::option_and_then_some)

…n_as_ref_deref)

…nd anything. For example: `if let Some(_) = foo() {}` can be reduced to `if foo().is_some() {}` (clippy::redundant_pattern_matching)

… type. These were introduced since I last fixed most of these occurences. (clippy::clone_on_copy, clippy::single_char_pattern)

Make error message clearer about creating new module This is a partial improvement for rust-lang#69492

@eddyb

ast: `Mac`/`Macro` -> `MacCall` It's now obvious that these refer to macro calls rather than to macro definitions. It's also a single name instead of two different names in different places. `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls. cc rust-lang#63586 (comment) r? @eddyb

`delay_span_bug` when codegen cannot select obligation Fix rust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

Update books ## nomicon 8 commits in 3e6e1001dc6e095dbd5c88005e80969f60e384e1..9f797e65e6bcc79419975b17aff8e21c9adc039f 2019-12-14 22:08:52 +0000 to 2020-03-04 03:45:13 +0100 - Rustup to latest rustc (rust-lang/nomicon#203) - (minor) Add backticks around type names (rust-lang/nomicon#197) - Add book.toml (rust-lang/nomicon#185) - Rename `Alloc` to `AllocRef` (rust-lang/nomicon#188) - Lifetimes: explain how to fix destructor example (rust-lang/nomicon#195) - mention soundness (rust-lang/nomicon#194) - Fix example in FFI section Calling Rust from C (rust-lang/nomicon#193) - Removed repeated word (rust-lang/nomicon#191) ## reference 8 commits in 64239df..559e09c 2020-02-10 19:05:13 +0100 to 2020-03-02 01:17:14 +0100 - Syntax error fix (rust-lang/reference#769) - Fix incorrect pseudocode for #[repr(C)] struct alignment (rust-lang/reference#766) - Replace "Field-Less" with "Fieldless" (rust-lang/reference#768) - Removed repeated word (rust-lang/reference#767) - Update for change in const lint name. (rust-lang/reference#764) - semantic type -> resolved type (rust-lang/reference#761) - add behavior change of relative paths without `self` in 2018 edition (rust-lang/reference#757) - assignment operator expressions -> compound assignment expressions (rust-lang/reference#759) ## rust-by-example 3 commits in 32facd5522ddbbf37baf01e4e4b6562bc55c071a..db57f899ea2a56a544c8d280cbf033438666273d 2020-02-11 09:25:06 -0300 to 2020-02-18 17:46:46 -0300 - Minor typo fix in src/mod/visibility (rust-lang/rust-by-example#1309) - Don't suggest Into implements a reverse conversion (rust-lang/rust-by-example#1307) - Improve grammar in example of 'in let' section (rust-lang/rust-by-example#1308) ## embedded-book 2 commits in b2e1092bf67bd4d7686c4553f186edbb7f5f92db..b81ffb7a6f4c5aaed92786e770e99db116aa4ebd 2020-01-30 08:45:46 +0000 to 2020-02-27 08:06:04 +0000 - Setting output to `high` needs a `true` argument (rust-embedded/book#227) - Add licence notes to index.md (rust-embedded/book#226)

@eddyb

Rename DefKind::Method and TraitItemKind::Method r? @eddyb, @Centril, or @matthewjasper cc rust-lang#69498 rust-lang#60163

@Dylan-DPC

…=Dylan-DPC Add explanation for E0380 r? @Dylan-DPC

Use associated constants of integer types Take advantage of rust-lang#68952 in the interpreter and some nearby modules :)

…ta, r=Mark-Simulacrum Toolstate: remove redundant beta-week check. I made a bit of a mistake in rust-lang#69624. The "beta regression" doesn't need to be checked twice. I also rolled up rust-lang#69693 to avoid merge conflicts.

Update macros.rs: fix documentation typo.

more clippy cleanups * Don't use .ok() before unwrapping via .expect() on a Result. * Use .map() to modify data inside Options instead of using .and_then(|x| Some(y)) * Use .as_deref() instead of .as_ref().map(Deref::deref) * Don't use "if let" bindings to only check a value and not actually bind anything. * Use single-char patter on {ends,starts}_with and remove clone on copy type.

JohnTitor · 2020-03-05T04:12:17Z

@bors r+ p=10 rollup=never

bors · 2020-03-05T04:12:18Z

📌 Commit 5089e11 has been approved by JohnTitor

bors · 2020-03-05T07:44:47Z

⌛ Testing commit 5089e11 with merge f6c22f0...

@ghost

Rollup of 10 pull requests Successful merges: - #69520 (Make error message clearer about creating new module) - #69589 (ast: `Mac`/`Macro` -> `MacCall`) - #69614 (`delay_span_bug` when codegen cannot select obligation) - #69641 (Update books) - #69674 (Rename DefKind::Method and TraitItemKind::Method ) - #69697 (Add explanation for E0380) - #69698 (Use associated constants of integer types) - #69705 (Toolstate: remove redundant beta-week check.) - #69711 (Update macros.rs: fix documentation typo.) - #69713 (more clippy cleanups) Failed merges: r? @ghost

bors · 2020-03-05T10:18:53Z

💔 Test failed - checks-azure

rust-highfive · 2020-03-05T10:18:53Z

The job x86_64-gnu-tools of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-03-05T09:37:58.3087575Z    Compiling clippy_lints v0.0.212 (/checkout/src/tools/clippy/clippy_lints)
2020-03-05T09:38:00.7931206Z error[E0432]: unresolved import `rustc_ast::ast::Mac`
2020-03-05T09:38:00.7932267Z  --> src/tools/clippy/clippy_lints/src/non_expressive_names.rs:3:92
2020-03-05T09:38:00.7932829Z   |
2020-03-05T09:38:00.7933887Z 3 |     Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Ident, Item, ItemKind, Local, Mac, Pat, PatKind,
2020-03-05T09:38:00.7935165Z   |                                                                                            ^^^ no `Mac` in `ast`
2020-03-05T09:38:00.7978692Z error[E0432]: unresolved import `rustc_ast::ast::Mac`
2020-03-05T09:38:00.7979316Z  --> src/tools/clippy/clippy_lints/src/write.rs:5:38
2020-03-05T09:38:00.7979752Z   |
2020-03-05T09:38:00.7979752Z   |
2020-03-05T09:38:00.7980315Z 5 | use rustc_ast::ast::{Expr, ExprKind, Mac, StrLit, StrStyle};
2020-03-05T09:38:00.7981437Z   |                                      ^^^ no `Mac` in `ast`
2020-03-05T09:38:01.1108136Z error[E0412]: cannot find type `Mac` in module `ast`
2020-03-05T09:38:01.1108824Z   --> src/tools/clippy/clippy_lints/src/dbg_macro.rs:33:63
2020-03-05T09:38:01.1109273Z    |
2020-03-05T09:38:01.1109273Z    |
2020-03-05T09:38:01.1109906Z 33 |     fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &ast::Mac) {
2020-03-05T09:38:01.1111374Z    |
2020-03-05T09:38:01.1111993Z help: there is an enum variant `rustc_ast::ast::ExprPrecedence::Mac`; try using the variant's enum
2020-03-05T09:38:01.1112545Z    |
2020-03-05T09:38:01.1112545Z    |
2020-03-05T09:38:01.1113206Z 33 |     fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &rustc_ast::ast::ExprPrecedence) {
2020-03-05T09:38:01.1119527Z 
2020-03-05T09:38:03.0104568Z [RUSTC-TIMING] cargo_metadata test:false 20.905
2020-03-05T09:38:03.3697307Z error[E0599]: no variant or associated item named `Mac` found for enum `rustc_ast::ast::ExprKind` in the current scope
2020-03-05T09:38:03.3698204Z    --> src/tools/clippy/clippy_lints/src/utils/sugg.rs:159:30
---
2020-03-05T09:38:04.0339195Z     |
2020-03-05T09:38:04.0340237Z 288 |                 let body = cx.tcx.hir().body(eid);
2020-03-05T09:38:04.0341835Z     |                                              ^^^
2020-03-05T09:38:04.0343015Z     |                                              |
2020-03-05T09:38:04.0344924Z     |                                              expected struct `rustc_hir::BodyId`, found `&rustc_hir::BodyId`
2020-03-05T09:38:04.0346404Z     |                                              help: consider dereferencing the borrow: `*eid`
2020-03-05T09:38:04.1374892Z error[E0599]: no variant or associated item named `Method` found for enum `rustc_hir::TraitItemKind<'_>` in the current scope
2020-03-05T09:38:04.1376539Z   --> src/tools/clippy/clippy_lints/src/inline_fn_without_body.rs:35:31
2020-03-05T09:38:04.1379162Z    |
2020-03-05T09:38:04.1380120Z 35 |         if let TraitItemKind::Method(_, TraitMethod::Required(_)) = item.kind {
---
2020-03-05T09:38:04.2155512Z 
2020-03-05T09:38:04.4368224Z error[E0308]: mismatched types
2020-03-05T09:38:04.4368810Z    --> src/tools/clippy/clippy_lints/src/lifetimes.rs:108:43
2020-03-05T09:38:04.4369260Z     |
2020-03-05T09:38:04.4369842Z 108 |             check_fn_inner(cx, &sig.decl, body, &item.generics, item.span, true);
2020-03-05T09:38:04.4370747Z     |                                           ^^^^ expected struct `rustc_hir::BodyId`, found `&rustc_hir::BodyId`
2020-03-05T09:38:04.4371988Z     = note: expected enum `std::option::Option<rustc_hir::BodyId>`
2020-03-05T09:38:04.4372624Z                found enum `std::option::Option<&rustc_hir::BodyId>`
2020-03-05T09:38:04.4372892Z 
2020-03-05T09:38:04.9481109Z error[E0599]: no variant or associated item named `Method` found for enum `rustc_hir::def::DefKind` in the current scope
---
2020-03-05T10:17:30.7585861Z Verifying status of embedded-book...
2020-03-05T10:17:30.7586501Z This PR updated 'src/doc/embedded-book', verifying if status is 'test-pass'...
2020-03-05T10:17:30.7587114Z Verifying status of rustc-guide...
2020-03-05T10:17:30.7634348Z Cloning into 'rust-toolstate'...
2020-03-05T10:17:31.4160977Z error: Tool `clippy-driver` has regressed from test-fail to build-fail during beta week.
2020-03-05T10:17:31.4178215Z Build completed unsuccessfully in 0:00:02
2020-03-05T10:17:31.4240512Z == clock drift check ==
2020-03-05T10:17:31.4251889Z   local time: Thu Mar  5 10:17:31 UTC 2020
2020-03-05T10:17:31.6904248Z   network time: Thu, 05 Mar 2020 10:17:31 GMT
2020-03-05T10:17:31.6904248Z   network time: Thu, 05 Mar 2020 10:17:31 GMT
2020-03-05T10:17:31.6904603Z == end clock drift check ==
2020-03-05T10:17:32.0101861Z 
2020-03-05T10:17:32.0177781Z ##[error]Bash exited with code '1'.
2020-03-05T10:17:32.0249445Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-05T10:17:32.0253626Z ==============================================================================
2020-03-05T10:17:32.0253944Z Task         : Get sources
2020-03-05T10:17:32.0254263Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

JohnTitor · 2020-03-05T10:26:33Z

Oh, I just notice we're in beta week, closing.

kornelski and others added 29 commits March 1, 2020 13:46

Make error message clearer about creating new module

515446c

rust-lang#69492

Apply rustfmt :(

96b3261

delay_span_bug when codegen cannot select obligation

7b6f5ed

Fix rust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

DefKind::Method -> DefKind::AssocFn

98c7ed6

rename TraitItemKind::Method -> Fn

3aeb9f0

Add explanation for E0380

c745b4a

use integer assoc consts instead of methods

6db7e34

cover some more nearby cases

f0c3cf2

Update books

8ea676e

Toolstate: remove redundant beta-week check.

0e1cd59

more toolstate comments

a6d8c9c

Further clarifications and comments on toolstate operation.

a41f1f1

Update macros.rs: fix documentation typo.

729d49d

Don't use .ok() before unwrapping via .expect() on a Result.

07168f9

The Result can be expect-unwrapped directly. (clippy::ok_expect)

Use .map() to modify data inside Options instead of using .and_then(|…

569676b

…x| Some(y)) (clippy::option_and_then_some)

Use .as_deref() instead of .as_ref().map(Deref::deref) (clippy::optio…

38f5db7

…n_as_ref_deref)

Don't use "if let" bindings to only check a value and not actually bi…

d8d2004

…nd anything. For example: `if let Some(_) = foo() {}` can be reduced to `if foo().is_some() {}` (clippy::redundant_pattern_matching)

ast: Mac/Macro -> MacCall

27becb2

Use single-char patter on {ends,starts}_with and remove clone on copy…

80ed505

… type. These were introduced since I last fixed most of these occurences. (clippy::clone_on_copy, clippy::single_char_pattern)

Rollup merge of rust-lang#69520 - kornelski:e69492, r=cramertj

91d521e

Make error message clearer about creating new module This is a partial improvement for rust-lang#69492

Rollup merge of rust-lang#69614 - estebank:ice-age, r=davidtwco

e067bf4

`delay_span_bug` when codegen cannot select obligation Fix rust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

Rollup merge of rust-lang#69674 - mark-i-m:assoc-fn, r=Centril

210d693

Rename DefKind::Method and TraitItemKind::Method r? @eddyb, @Centril, or @matthewjasper cc rust-lang#69498 rust-lang#60163

Rollup merge of rust-lang#69697 - GuillaumeGomez:explanation-e0380, r…

c9f7758

…=Dylan-DPC Add explanation for E0380 r? @Dylan-DPC

Rollup merge of rust-lang#69698 - RalfJung:int_assoc, r=davidtwco

2ef7c86

Use associated constants of integer types Take advantage of rust-lang#68952 in the interpreter and some nearby modules :)

Rollup merge of rust-lang#69711 - penelopezone:patch-1, r=steveklabnik

e15d393

Update macros.rs: fix documentation typo.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 5, 2020

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 Mar 5, 2020

JohnTitor closed this Mar 5, 2020

JohnTitor deleted the rollup-vv7w65h branch March 5, 2020 10:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests#69724

Rollup of 10 pull requests#69724
JohnTitor wants to merge 29 commits intorust-lang:masterfrom
JohnTitor:rollup-vv7w65h

JohnTitor commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

rust-highfive commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Conversation

JohnTitor commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

rust-highfive commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants