Rollup of 11 pull requests #51082

kennytm · 2018-05-26T11:32:34Z

Successful merges:

Underline multiple suggested replacements in the same line #50987 (Underline multiple suggested replacements in the same line)
Add documentation about env! second argument #51014 (Add documentation about env! second argument)
Remove unused lowering field and method #51034 (Remove unused lowering field and method)
Use AllFacts from polonius-engine #51047 (Use AllFacts from polonius-engine)
Add more missing examples for Formatter #51048 (Add more missing examples for Formatter)
Mention and use Once::new instead of ONCE_INIT #51056 (Mention and use Once::new instead of ONCE_INIT)
What does an expression look like, that consists only of special characters? #51059 (What does an expression look like, that consists only of special characters?)
Update nomicon link in transmute docs #51065 (Update nomicon link in transmute docs)
Add inner links in documentation #51067 (Add inner links in documentation)
Fail typecheck if we encounter a bogus break #51070 (Fail typecheck if we encounter a bogus break)
Rename TokenStream::empty to TokenStream::new #51073 (Rename TokenStream::empty to TokenStream::new)

Failed merges:

Follow up to rust-lang#50943. Fix rust-lang#50977.

When suggesting code that has a shorter span than the current code, account for this by keeping the offset as a signed value.

…acters?

The list of "invalid primitive values" has moved to a different URL within the Rustonomicon.

From [this SO question](https://stackoverflow.com/q/50518757/2733851) it looks like this page isn't really clear. I personally do think this page is quite clear, the only think I could think of was adding some references.

Lone breaks outside of loops create errors in the loop check pass but as they are not fatal, compilation continues. MIR building code assumes all HIR break statements to point to valid locations and fires ICEs if this assumption is violated. In normal compilation, this causes no issues, as code apparently prevents MIR from being built if errors are present. However, before that, typecheck runs and with it MIR const eval. Here we operate differently from normal compilation: it doesn't check for any errors except for type checker ones and then directly builds the MIR. This constellation causes an ICE-on-error if bogus break statements are being put into array length expressions. This commit fixes this ICE by letting typecheck fail if bogus break statements are encountered. This way, MIR const eval fails cleanly with a type check error. Fixes rust-lang#50576 Fixes rust-lang#50581

There is no precedent for the `empty` name -- we do not have `Vec::empty` or `HashMap::empty` etc.

…ions, r=petrochencov Underline multiple suggested replacements in the same line <img width="685" alt="screen shot 2018-05-22 at 21 06 48" src="https://user-images.githubusercontent.com/1606434/40403051-174f3180-5e04-11e8-86b6-261630c5ff80.png"> Follow up to rust-lang#50943. Fix rust-lang#50977.

@QuietMisdreavus

…dreavus Add documentation about env! second argument Fixes rust-lang#48044. r? @QuietMisdreavus

@nikomatsakis

Remove unused lowering field and method r? @nikomatsakis So while trying to understand lowering better, I found out that there's something related to creating definitions. Analyzing that further, I realized that it is entirely dead code. The `parent_def` field was only ever used for setting and resetting the field itself. The field was never read anywhere else and thus its value was entirely unused. Maybe the `unused_field` lint should detect when the only use of a field is the field being read without using the read value other than writing back to the field? The diff is best viewed without whitespace changes getting in the way: https://github.com/rust-lang/rust/pull/51034/files?w=1

…s, r=nikomatsakis Use AllFacts from polonius-engine

@QuietMisdreavus

…r=QuietMisdreavus Add more missing examples for Formatter r? @QuietMisdreavus

Mention and use `Once::new` instead of `ONCE_INIT`

@CryZe

What does an expression look like, that consists only of special characters? I had a lot of fun creating this together with @CryZe

Update nomicon link in transmute docs The list of "invalid primitive values" has moved to a different URL within the Rustonomicon.

Add inner links in documentation From [this SO question](https://stackoverflow.com/q/50518757/2733851) it looks like this page isn't really clear. I personally do think this page is quite clear, the only think I could think of was adding some references.

Fail typecheck if we encounter a bogus break Lone breaks outside of loops create errors in the loop check pass but as they are not fatal, compilation continues. MIR building code assumes all HIR break statements to point to valid locations and fires ICEs if this assumption is violated. In normal compilation, this causes no issues, as code apparently prevents MIR from being built if errors are present. However, before that, typecheck runs and with it MIR const eval. Here we operate differently from normal compilation: it doesn't check for any errors except for type checker ones and then directly builds the MIR. This constellation causes an ICE-on-error if bogus break statements are being put into array length expressions. This commit fixes this ICE by letting typecheck fail if bogus break statements are encountered. This way, MIR const eval fails cleanly with a type check error. Fixes rust-lang#50576 Fixes rust-lang#50581

@alexcrichton

Rename TokenStream::empty to TokenStream::new There is no precedent for the `empty` name -- we do not have `Vec::empty` or `HashMap::empty` etc. I would propose landing this but reflecting it in a non-breaking release of proc-macro2 that provides both `new` and a deprecated `empty` constructor. Tracking issue: rust-lang#38356 r? @alexcrichton

rust-highfive · 2018-05-26T11:32:44Z

r? @pnkfelix

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

kennytm · 2018-05-26T11:32:53Z

@bors r+ p=11

bors · 2018-05-26T11:32:54Z

📌 Commit 84b2e14 has been approved by kennytm

bors · 2018-05-26T12:03:34Z

⌛ Testing commit 84b2e14 with merge 7a0e6a8...

Rollup of 11 pull requests Successful merges: - #50987 (Underline multiple suggested replacements in the same line) - #51014 (Add documentation about env! second argument) - #51034 (Remove unused lowering field and method) - #51047 (Use AllFacts from polonius-engine) - #51048 (Add more missing examples for Formatter) - #51056 (Mention and use `Once::new` instead of `ONCE_INIT`) - #51059 (What does an expression look like, that consists only of special characters?) - #51065 (Update nomicon link in transmute docs) - #51067 (Add inner links in documentation) - #51070 (Fail typecheck if we encounter a bogus break) - #51073 (Rename TokenStream::empty to TokenStream::new) Failed merges:

bors · 2018-05-26T14:30:25Z

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 7a0e6a8 to master...

estebank and others added 27 commits May 24, 2018 04:16

Underline multiple suggested replacements in the same line

2daa013

Follow up to rust-lang#50943. Fix rust-lang#50977.

Account for negative offsets in suggestions

50eefc0

When suggesting code that has a shorter span than the current code, account for this by keeping the offset as a signed value.

Add Once::new as a way of constructing a Once

1c2abda

Update the Once docs to use Once::new

2a900e2

Remove unused lowering field and method

6a0806b

Fix impl Trait suggestion

f36c643

Add documentation about env! second argument

fe9a195

Add more missing examples for Formatter

6ff9409

Use AllFacts from polonius-engine

8429d11

What does an expression look like, that consists only of special char…

de12d43

…acters?

Call it

7c97203

Don't use a char that's already used within the expr

5ad84cf

Update nomicon link in transmute docs

37cbd11

The list of "invalid primitive values" has moved to a different URL within the Rustonomicon.

Add inner links in documentation

91f7ae2

From [this SO question](https://stackoverflow.com/q/50518757/2733851) it looks like this page isn't really clear. I personally do think this page is quite clear, the only think I could think of was adding some references.

Rename TokenStream::empty to TokenStream::new

a49bc9c

There is no precedent for the `empty` name -- we do not have `Vec::empty` or `HashMap::empty` etc.

Rollup merge of rust-lang#51014 - GuillaumeGomez:env_docs, r=QuietMis…

ee18e92

…dreavus Add documentation about env! second argument Fixes rust-lang#48044. r? @QuietMisdreavus

Rollup merge of rust-lang#51047 - spastorino:use_polonius_engine_fact…

e667e7b

…s, r=nikomatsakis Use AllFacts from polonius-engine

Rollup merge of rust-lang#51048 - GuillaumeGomez:formatter-examples, …

08b4170

…r=QuietMisdreavus Add more missing examples for Formatter r? @QuietMisdreavus

Rollup merge of rust-lang#51056 - tbu-:pr_once_new, r=dtolnay

e0e598b

Mention and use `Once::new` instead of `ONCE_INIT`

Rollup merge of rust-lang#51059 - oberien:patch-1, r=nikomatsakis

5d95492

What does an expression look like, that consists only of special characters? I had a lot of fun creating this together with @CryZe

Rollup merge of rust-lang#51065 - mbrubeck:docs, r=rkruppe

18028eb

Update nomicon link in transmute docs The list of "invalid primitive values" has moved to a different URL within the Rustonomicon.

rust-highfive assigned pnkfelix May 26, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 26, 2018

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 May 26, 2018

kennytm unassigned pnkfelix May 26, 2018

bors merged commit 84b2e14 into rust-lang:master May 26, 2018

This was referenced May 26, 2018

[WIP] async functions #50850

Closed

[WIP] remove Location::All #50938

Closed

Stabilize Formatter alignment #51078

Merged

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #51082

Rollup of 11 pull requests #51082

kennytm commented May 26, 2018

rust-highfive commented May 26, 2018

kennytm commented May 26, 2018

bors commented May 26, 2018

bors commented May 26, 2018

bors commented May 26, 2018

Rollup of 11 pull requests #51082

Rollup of 11 pull requests #51082

Conversation

kennytm commented May 26, 2018

rust-highfive commented May 26, 2018

kennytm commented May 26, 2018

bors commented May 26, 2018

bors commented May 26, 2018

bors commented May 26, 2018