Rollup of 12 pull requests #50413

kennytm · 2018-05-03T08:11:36Z

Successful merges:

Add query search order check #50302 (Add query search order check)
Fix invalid path generation in rustdoc search #50320 (Fix invalid path generation in rustdoc search)
Rename "show type declaration" to "show declaration" #50349 (Rename "show type declaration" to "show declaration")
Clarify wordings of the unstable_name_collision lint. #50360 (Clarify wordings of the unstable_name_collision lint.)
Use two vectors in nearest_common_ancestor. #50365 (Use two vectors in nearest_common_ancestor.)
Allow unaligned reads in constants #50393 (Allow unaligned reads in constants)
Revert "Implement FromStr for PathBuf" #50401 (Revert "Implement FromStr for PathBuf")
Forbid constructing empty identifiers from concat_idents #50406 (Forbid constructing empty identifiers from concat_idents)
Always inline simple BytePos and CharPos methods. #50407 (Always inline simple BytePos and CharPos methods.)
check if the token is a lifetime before parsing #50416 (check if the token is a lifetime before parsing)
Update Cargo #50417 (Update Cargo)
Fix ICE when using a..=b in a closure. #50421 (Fix ICE when using a..=b in a closure.)

Failed merges:

Stabilizing an inherent method may cause change in behavior instead of inference error. Updated to use the wording from [varkor's comment]. Closes rust-lang#50232. [varkor's comment]: rust-lang#50232 (comment)

When looking at any scope in scope chain A, we only need to look for matches among scopes previously seen in scope chain B, and vice versa. This halves the number of "seen before?" comparisons, speeding up some runs of style-servo, clap-rs, and syn by 1--2%.

This reverts commit 05a9acc.

Because they are (a) trivial, and (b) super hot. This change speeds up most rustc-benchmarks, the best by 5%.

@QuietMisdreavus

…er-check, r=QuietMisdreavus Add query search order check Fixes rust-lang#50180. r? @QuietMisdreavus

rust-highfive · 2018-05-03T08:11:39Z

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

rust-highfive · 2018-05-03T08:11:40Z

r? @aturon

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

kennytm · 2018-05-03T08:16:30Z

@bors r+ p=8

bors · 2018-05-03T08:16:31Z

📌 Commit 947dfb6 has been approved by kennytm

kennytm · 2018-05-03T15:43:44Z

@bors r+

Added #50417, #50421.

bors · 2018-05-03T15:43:44Z

📌 Commit 7882359 has been approved by kennytm

bors · 2018-05-03T16:07:41Z

⌛ Testing commit 7882359cb37741bbacbaed6832bcbbf5a43ba020 with merge 4a017906b33a9458b69c9fa7ec77f4d2faf7eb69...

bors · 2018-05-03T18:01:03Z

💔 Test failed - status-appveyor

@kirillkh

…-two-vecs, r=nikomatsakis Use two vectors in nearest_common_ancestor. When looking at any scope in scope chain A, we only need to look for matches among scopes previously seen in scope chain B, and vice versa. This halves the number of "seen before?" comparisons, speeding up some runs of style-servo, clap-rs, and syn by 1--2%. Thanks to @kirillkh for the suggestion. r? @nikomatsakis

Allow unaligned reads in constants fixes rust-lang#50356 introduced in rust-lang#49513

…r=sfackler Revert "Implement FromStr for PathBuf" This reverts commit 05a9acc. The libs team was discussing rust-lang#44431 today and the changes originally added in rust-lang#48292 and the conclusion was that we'd like to revert this for now until `!` is stable. This'll provide us maximal flexibility to tweak the error type here in the future, and it looks like `!` is close-ish to stabilization so hopefully this won't be delayed for too long.

…elwoerister Always inline simple BytePos and CharPos methods. Because they are (a) trivial, and (b) super hot. This change speeds up most rustc-perf benchmarks, the best by 5%. Full measurements: ``` coercions-check avg: -3.0% min: -5.4% max: -1.3% helloworld-check avg: -3.9% min: -4.1% max: -3.6% unify-linearly-check avg: -3.1% min: -3.7% max: -2.5% deeply-nested-check avg: -2.6% min: -3.6% max: -2.1% coercions-opt avg: -2.1% min: -3.6% max: -1.3% coercions avg: -2.0% min: -3.5% max: -1.0% issue-46449-check avg: -2.8% min: -3.1% max: -2.6% parser-check avg: -2.6% min: -3.1% max: -2.0% deeply-nested-opt avg: -1.5% min: -3.0% max: -0.8% deeply-nested avg: -1.8% min: -2.9% max: -1.1% issue-46449 avg: -1.4% min: -2.7% max: -1.1% issue-46449-opt avg: -1.0% min: -2.7% max: -0.5% regression-31157-check avg: -1.7% min: -2.3% max: -1.1% tuple-stress-opt avg: -1.0% min: -2.2% max: -0.5% tokio-webpush-simple-check avg: -1.6% min: -2.1% max: -1.2% tuple-stress-check avg: -1.2% min: -2.1% max: -0.8% unused-warnings-check avg: -1.6% min: -2.0% max: -1.4% encoding-check avg: -1.4% min: -1.8% max: -1.0% tuple-stress avg: -1.0% min: -1.7% max: -0.6% encoding-opt avg: -0.9% min: -1.6% max: -0.3% unused-warnings avg: -1.3% min: -1.6% max: -1.2% unused-warnings-opt avg: -1.3% min: -1.5% max: -1.2% encoding avg: -1.0% min: -1.5% max: -0.4% html5ever-opt avg: -0.7% min: -1.5% max: -0.3% futures avg: -1.0% min: -1.5% max: -0.5% futures-check avg: -1.0% min: -1.5% max: -0.5% futures-opt avg: -0.8% min: -1.4% max: -0.3% regression-31157-opt avg: -0.5% min: -1.4% max: -0.0% unify-linearly-opt avg: -1.2% min: -1.4% max: -1.0% parser-opt avg: -1.2% min: -1.4% max: -1.0% helloworld avg: -1.3% min: -1.4% max: -1.3% helloworld-opt avg: -1.3% min: -1.3% max: -1.3% parser avg: -1.2% min: -1.3% max: -1.0% regex-check avg: -1.1% min: -1.3% max: -0.7% unify-linearly avg: -1.1% min: -1.3% max: -1.0% syn-check avg: -0.8% min: -1.3% max: -0.3% piston-image-check avg: -0.7% min: -1.2% max: -0.4% regex-opt avg: -0.5% min: -1.2% max: -0.0% syn avg: -0.6% min: -1.2% max: -0.3% hyper avg: -0.8% min: -1.2% max: -0.4% syn-opt avg: -0.5% min: -1.2% max: -0.1% regex avg: -0.7% min: -1.2% max: -0.3% regression-31157 avg: -0.7% min: -1.2% max: -0.3% clap-rs-check avg: -0.6% min: -1.1% max: -0.2% hyper-check avg: -0.8% min: -1.1% max: -0.5% piston-image-opt avg: -0.4% min: -1.1% max: -0.0% hyper-opt avg: -0.6% min: -1.0% max: 0.0% inflate avg: -0.4% min: -1.0% max: -0.2% html5ever avg: -0.5% min: -1.0% max: -0.2% inflate-opt avg: -0.3% min: -1.0% max: 0.3% deep-vector-check avg: -0.6% min: -1.0% max: -0.3% style-servo-check avg: -0.7% min: -1.0% max: -0.5% tokio-webpush-simple-opt avg: -0.3% min: -0.9% max: 0.0% inflate-check avg: -0.3% min: -0.9% max: -0.1% piston-image avg: -0.4% min: -0.8% max: -0.2% deep-vector avg: -0.4% min: -0.8% max: -0.1% clap-rs avg: -0.4% min: -0.7% max: -0.2% deep-vector-opt avg: -0.2% min: -0.7% max: 0.2% style-servo avg: -0.3% min: -0.7% max: 0.1% crates.io avg: -0.4% min: -0.6% max: -0.2% crates.io-opt avg: -0.3% min: -0.6% max: -0.1% tokio-webpush-simple avg: -0.4% min: -0.6% max: -0.3% crates.io-check avg: -0.4% min: -0.6% max: -0.3% html5ever-check avg: -0.4% min: -0.6% max: -0.2% serde avg: -0.1% min: -0.6% max: 0.2% serde-check avg: -0.1% min: -0.5% max: 0.4% serde-opt avg: -0.2% min: -0.5% max: -0.1% style-servo-opt avg: -0.2% min: -0.4% max: -0.0% clap-rs-opt avg: -0.1% min: -0.3% max: 0.0%

Update Cargo This should fix RLS cc rust-lang#50379, rust-lang/cargo#5465

…g-range-inclusive-from-closure, r=michaelwoerister Fix ICE when using a..=b in a closure. Fix rust-lang#50415.

Forbid constructing empty identifiers from concat_idents The empty identifier is a [reserved identifier](https://github.com/rust-lang/rust/blob/8a37c75a3a661385cc607d934c70e86a9eaf5fd7/src/libsyntax_pos/symbol.rs#L300-L305) in rust, apparently used for black magicks like representing the crate root or somesuch... and therefore, being able to construct it is Ungood. Presumably. ...even if the macro that lets you construct it is so useless that you can't actually do any damage with it. (and believe me, I tried) Fixes rust-lang#50403. **Note:** I noticed that when you try to do something similar with `proc_macro::Term`, the compiler actually catches it and flags the identifier as reserved. Perhaps a better solution would be to somehow have that same check applied here.

check if the token is a lifetime before parsing Fixes rust-lang#50381.

kennytm · 2018-05-03T18:18:02Z

@bors r+

Removed #50320 (it can't live together with #50302)
Added #50406, #50416.

bors · 2018-05-03T18:18:04Z

📌 Commit bab812d has been approved by kennytm

…ration, r=QuietMisdreavus Fix invalid path generation in rustdoc search Fixes rust-lang#50311.

kennytm · 2018-05-03T20:28:58Z

@bors r+

Added back #50320.

bors · 2018-05-03T20:28:59Z

📌 Commit 03a0402 has been approved by kennytm

bors · 2018-05-03T20:46:03Z

⌛ Testing commit 03a0402 with merge e82261d...

Rollup of 12 pull requests Successful merges: - #50302 (Add query search order check) - #50320 (Fix invalid path generation in rustdoc search) - #50349 (Rename "show type declaration" to "show declaration") - #50360 (Clarify wordings of the `unstable_name_collision` lint.) - #50365 (Use two vectors in nearest_common_ancestor.) - #50393 (Allow unaligned reads in constants) - #50401 (Revert "Implement FromStr for PathBuf") - #50406 (Forbid constructing empty identifiers from concat_idents) - #50407 (Always inline simple BytePos and CharPos methods.) - #50416 (check if the token is a lifetime before parsing) - #50417 (Update Cargo) - #50421 (Fix ICE when using a..=b in a closure.) Failed merges:

bors · 2018-05-03T23:12:03Z

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

kennytm-githubbot · 2018-05-03T23:13:20Z

📣 Toolstate changed by #50413!

Tested on commit e82261d.
Direct link to PR: #50413

🎉 rls on linux: test-fail → test-pass.

Tested on commit rust-lang/rust@e82261d. Direct link to PR: <rust-lang/rust#50413> 🎉 rls on linux: test-fail → test-pass.

GuillaumeGomez and others added 10 commits April 28, 2018 17:21

Add query search order check

00bbda1

Rename "show type declaration" to "show declaration"

135ee85

Clarify wordings of the unstable_name_collision lint.

a78028d

Stabilizing an inherent method may cause change in behavior instead of inference error. Updated to use the wording from [varkor's comment]. Closes rust-lang#50232. [varkor's comment]: rust-lang#50232 (comment)

Allow unaligned reads in constants

bf2a6c3

Revert "Implement FromStr for PathBuf"

f684147

This reverts commit 05a9acc.

forbid empty identifiers from concat_idents

cd54b3e

Always inline simple BytePos and CharPos methods.

e740b97

Because they are (a) trivial, and (b) super hot. This change speeds up most rustc-benchmarks, the best by 5%.

add missing output for ui test

fbc57a7

Rollup merge of rust-lang#50302 - GuillaumeGomez:add-query-search-ord…

4e3da52

…er-check, r=QuietMisdreavus Add query search order check Fixes rust-lang#50180. r? @QuietMisdreavus

rust-highfive assigned aturon May 3, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 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 3, 2018

kennytm unassigned aturon May 3, 2018

ExpHP and others added 4 commits May 3, 2018 06:49

update concat_idents doc stubs

8e38d02

check if the token is a lifetime before parsing

390c3ce

Update Cargo

70c52e5

Fix issue rust-lang#50415.

83c4505

kennytm changed the title ~~Rollup of 8 pull requests~~ Rollup of 10 pull requests May 3, 2018

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 3, 2018

kennytm added 8 commits May 4, 2018 02:12

Rollup merge of rust-lang#50393 - oli-obk:packed_const_panic, r=eddyb

46bc2c2

Allow unaligned reads in constants fixes rust-lang#50356 introduced in rust-lang#49513

Rollup merge of rust-lang#50417 - matklad:pr-50379, r=alexcrichton

5976e8a

Update Cargo This should fix RLS cc rust-lang#50379, rust-lang/cargo#5465

Rollup merge of rust-lang#50421 - kennytm:fix-50415-ice-when-returnin…

dfb32af

…g-range-inclusive-from-closure, r=michaelwoerister Fix ICE when using a..=b in a closure. Fix rust-lang#50415.

Rollup merge of rust-lang#50416 - rleungx:non-lifetime, r=estebank

bab812d

check if the token is a lifetime before parsing Fixes rust-lang#50381.

kennytm changed the title ~~Rollup of 10 pull requests~~ Rollup of 11 pull requests May 3, 2018

kennytm force-pushed the rollup branch from 7882359 to bab812d Compare May 3, 2018 18:17

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 3, 2018

GuillaumeGomez and others added 2 commits May 3, 2018 22:14

Fix invalid path generation in rustdoc search

a876d28

Rollup merge of rust-lang#50320 - GuillaumeGomez:fix-search-path-gene…

03a0402

…ration, r=QuietMisdreavus Fix invalid path generation in rustdoc search Fixes rust-lang#50311.

kennytm changed the title ~~Rollup of 11 pull requests~~ Rollup of 12 pull requests May 3, 2018

bors merged commit 03a0402 into rust-lang:master May 3, 2018

This was referenced May 3, 2018

Introduce ConstValue and use it instead of miri's Value for constant values #50249

Merged

Better typeck divergence #50262

Closed

Replace new-in-1.26 ParsePathError with ! #49404

Closed

Update RLS and Rustfmt (and Cargo) #50433

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 12 pull requests #50413

Rollup of 12 pull requests #50413

kennytm commented May 3, 2018 •

edited

Loading

rust-highfive commented May 3, 2018

rust-highfive commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

kennytm-githubbot commented May 3, 2018

Rollup of 12 pull requests #50413

Rollup of 12 pull requests #50413

Conversation

kennytm commented May 3, 2018 • edited Loading

rust-highfive commented May 3, 2018

rust-highfive commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

kennytm commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

bors commented May 3, 2018

kennytm-githubbot commented May 3, 2018

kennytm commented May 3, 2018 •

edited

Loading