Rollup of 9 pull requests #59522

Centril · 2019-03-29T11:32:34Z

Successful merges:

Update books #59366 (Update books)
Update jemalloc-sys to version 0.3.0 #59436 (Update jemalloc-sys to version 0.3.0)
Update rustfmt to 1.2.0 #59454 (Update rustfmt to 1.2.0)
Fix error in Rust 2018 + no_core environment #59462 (Fix error in Rust 2018 + no_core environment)
Better diagnostic for binary operation on BoxedValues #59467 (Better diagnostic for binary operation on BoxedValues)
Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans)
Update stdsimd #59480 (Update stdsimd)
Visit ImplItem in dead_code lint #59486 (Visit ImplItem in dead_code lint)
Rename type_parameters to generics and so on #59510 (Rename type_parameters to generics and so on)

Failed merges:

Update cargo #59516 (Update cargo)

When two multiline span labels point at the same span, we special case the output to avoid weird behavior: ``` foo( _____^ |_____| || bar, || ); || ^ ||______| |______foo baz ``` instead showing ``` foo( _____^ | bar, | ); | ^ | | |______foo baz ```

Also, add me to reference, alercah has taken a step back from involvement.

…tion to point at operator

Update books Update reference, book, rust-by-example, edition-guide, embedded-book ## reference 15 commits in 41493ff..27ad493 2019-03-05 12:32:22 +0100 to 2019-03-26 02:06:15 +0100 - Document wasm_import_module for #[link]. (rust-lang/reference#554) - Fix tidy error. (rust-lang/reference#552) - Some minor contributing updates. (rust-lang/reference#551) - Document `type_length_limit`. (rust-lang/reference#546) - Add some terms to the glossary. (rust-lang/reference#547) - Document `target_feature` and `cfg_target_feature`. (rust-lang/reference#545) - Remove undocumented page (rust-lang/reference#539) - Reorg and update attributes (rust-lang/reference#537) - Fix some minor link errors. (rust-lang/reference#538) - Add linkchecker. (rust-lang/reference#521) - Expand docs on Macros By Example. (rust-lang/reference#511) - document #[panic_handler] (rust-lang/reference#362) - document #[used] (rust-lang/reference#361) - Note that UB is program-global (rust-lang/reference#490) - Fix copy-paste error in procedural-macros.md (rust-lang/reference#533) ## book 16 commits in 9cffbeabec3bcec42d09432bfe7705125c848889..b93ec30bbc7b1b5c2f44223249ab359bed2ed5a6 2019-03-02 08:22:41 -0500 to 2019-03-26 16:54:10 -0400 - Unignore example that now compiles - Fix code snippet (rust-lang/book#1863) - Fix mdbook link text in readme (rust-lang/book#1881) - Wrap to 80 cols - Make sentence more complete (rust-lang/book#1885) - consistenly use increment and decrement (rust-lang/book#1884) - Fix link to Reference's conditional-compilation. (rust-lang/book#1878) - Fix subject/verb agreement - Remove nostarch snapshot files that have been incorporated and checked - haha teach the dictionary steve's name - Add authorship info to the front page - fix accidental <ol>'s (rust-lang/book#1866) - Edits to Macros (rust-lang/book#1848) - Mention `lock` returns `MutexGuard` wrapped in a `LockResult` - Add an example that illustrates NLL (rust-lang/book#1842) - change the parameter name from `type` to `kind` (rust-lang/book#1845) ## rust-by-example 33 commits in 2ce92beabb912d417a7314d6da83ac9b50dc2afb..f68ef3d0f4959f6a7d92a08d9994b117f0f4d32d 2018-11-20 10:10:23 -0500 to 2019-03-12 15:32:12 -0300 - Fix some broken links. (rust-lang/rust-by-example#1161) - Update links in README (rust-lang/rust-by-example#1167) - Add score/lifetimes/trait.md (rust-lang/rust-by-example#1168) - Fix rust-lang/rust-by-example#1147 - No more `open_mode` method (rust-lang/rust-by-example#1164) - Fix for loop description in list print example (rust-lang/rust-by-example#1162) - Add link to Cargo chapter in the index page (rust-lang/rust-by-example#1159) - Fix grammar in sentence about integer notation (rust-lang/rust-by-example#1157) - Do not use deprecated functions from `std::error::Error` trait (rust-lang/rust-by-example#1151) - Update new_types.md to clarify conversion to base type (rust-lang/rust-by-example#1148) - Fix compatibility with Rust 2018 (rust-lang/rust-by-example#1150) - Hello: Fix hint link in `fmt` chapter. (rust-lang/rust-by-example#1146) - Clarify pub(restricted) example a bit (rust-lang/rust-by-example#1133) - Add "literal" to list of macro designators (rust-lang/rust-by-example#1153) - Minor fixes for the macros chapter (rust-lang/rust-by-example#1113) - Use new book links instead of the old second-edition ones (rust-lang/rust-by-example#1143) - Recommend implementing Display over ToString (rust-lang/rust-by-example#1145) - Remove unused import and format with `rustfmt` (rust-lang/rust-by-example#1144) - fix typo (rust-lang/rust-by-example#1142) - Update syntax for 2018 Edition (rust-lang/rust-by-example#1136) - Added two missing full stops (rust-lang/rust-by-example#1138) - Removed unnecessary spaces before macro designators in macros/dry (rust-lang/rust-by-example#1139) - fix install mdbook command (rust-lang/rust-by-example#1128) - Changed word `function` to `type` in comment of fn area (rust-lang/rust-by-example#1132) - Added two missing backticks in generics/multi_bounds (rust-lang/rust-by-example#1129) - Fixed small logic error in error/option_unwrap/and_then (rust-lang/rust-by-example#1127) - Fix typo (rust-lang/rust-by-example#1125) - The code of conduct link was dead. I fixed it. (rust-lang/rust-by-example#1122) - I added a space in the Display fmt for Complex (rust-lang/rust-by-example#1123) - Fix Rust install link in the index (rust-lang/rust-by-example#1124) - Update cargo conventions section (rust-lang/rust-by-example#1121) - Fixed curly braces in the `To and from Strings` chapter to be parentheses (rust-lang/rust-by-example#1120) - Edit a typo (rust-lang/rust-by-example#1119) - Fixes rust-lang/rust-by-example#1115 by correcting the typo from into_iterator to into_iter (rust-lang/rust-by-example#1118) ## edition-guide 1 commits in aa0022c875907886cae8f3ef8e9ebf6e2a5e728d..b56ddb11548450a6df4edd1ed571b2bc304eb9e6 2019-02-27 22:10:39 -0800 to 2019-03-10 10:23:16 +0100 - Links fixes (rust-lang/edition-guide#133) ## embedded-book 6 commits in 9e656ead82bfe869493dec82653a52e27fa6a05c..07fd3880ea0874d82b1d9ed30ad3427ec98b4e8a 2019-03-03 16:03:26 +0000 to 2019-03-27 15:40:52 +0000 - Fix test errors. (rust-embedded/book#180) - Update qemu.md (rust-embedded/book#170) - Update no-std.md to remove obsolete FAQ link (rust-embedded/book#177) - We've come a long way :) (rust-embedded/book#176) - Correct link to team (rust-embedded/book#175) - Update some book links to their new homes. (rust-embedded/book#173)

Update jemalloc-sys to version 0.3.0 This PR updates jemalloc-sys from 0.1.8 to 0.3.0.

@nrc

Update rustfmt to 1.2.0 This release includes bug fixes and performance improvements from 1.1.0. Also it adds a new rustfmt tool attribute `#[rustfmt::skip::macros]`, which lets you skip formatting macro calls of your choice. cc @nrc @Centril @Xanewok

@Centril

Fix error in Rust 2018 + no_core environment Minimized reproduction: https://play.rust-lang.org/?version=nightly&mode=debug&edition=2018&gist=5b9f6c3026ec9d856699fa6dbd4361f0 This is a fix for the error that occurred in rust-lang#58702. r? @Centril

…bank Better diagnostic for binary operation on BoxedValues Fixes rust-lang#59458

…r=davidtwco Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans Fix rust-lang#58298.

Update stdsimd This PR fixes a regression introduced by ACLE support on thumbv4 targets, see: rust-lang/stdarch#704 .

Visit `ImplItem` in `dead_code` lint Fixes rust-lang#47131.

Rename `type_parameters` to `generics` and so on Some old variable names had fallen through the generics generalisation pull requests.

Centril · 2019-03-29T11:34:02Z

@bors r+ p=9

bors · 2019-03-29T11:34:03Z

📌 Commit 99e886d has been approved by Centril

bors · 2019-03-29T14:56:09Z

⌛ Testing commit 99e886d with merge d920dfc...

@ghost

Rollup of 9 pull requests Successful merges: - #59366 (Update books) - #59436 (Update jemalloc-sys to version 0.3.0) - #59454 (Update rustfmt to 1.2.0) - #59462 (Fix error in Rust 2018 + no_core environment) - #59467 (Better diagnostic for binary operation on BoxedValues) - #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans) - #59480 (Update stdsimd) - #59486 (Visit `ImplItem` in `dead_code` lint) - #59510 (Rename `type_parameters` to `generics` and so on) Failed merges: - #59516 (Update cargo) r? @ghost

fortanix-bot · 2019-03-29T15:08:13Z

Build failed for target x86_64-fortanix-unknown-sgx - status

cc @jethrogb

Centril · 2019-03-29T15:10:53Z

@jethrogb The bot is rather spammy and doesn't seem to work... can we silence it for now until it does?

bors · 2019-03-29T18:09:19Z

💔 Test failed - status-appveyor

Centril · 2019-03-29T18:09:32Z

@bors retry

bors · 2019-03-29T18:09:59Z

⌛ Testing commit 99e886d with merge e782d79...

@ghost

Rollup of 9 pull requests Successful merges: - #59366 (Update books) - #59436 (Update jemalloc-sys to version 0.3.0) - #59454 (Update rustfmt to 1.2.0) - #59462 (Fix error in Rust 2018 + no_core environment) - #59467 (Better diagnostic for binary operation on BoxedValues) - #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans) - #59480 (Update stdsimd) - #59486 (Visit `ImplItem` in `dead_code` lint) - #59510 (Rename `type_parameters` to `generics` and so on) Failed merges: - #59516 (Update cargo) r? @ghost

bors · 2019-03-29T21:45:30Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing e782d79 to master...

rust-highfive · 2019-03-29T21:46:54Z

📣 Toolstate changed by #59522!

Tested on commit e782d79.
Direct link to PR: #59522

🎉 embedded-book on windows: test-fail → test-pass (cc @adamgreig @andre-richter @jamesmunns @korken89 @ryankurte @thejpster @therealprof, @rust-lang/infra).
🎉 embedded-book on linux: test-fail → test-pass (cc @adamgreig @andre-richter @jamesmunns @korken89 @ryankurte @thejpster @therealprof, @rust-lang/infra).

@adamgreig

Tested on commit rust-lang/rust@e782d79. Direct link to PR: <rust-lang/rust#59522> 🎉 embedded-book on windows: test-fail → test-pass (cc @adamgreig @andre-richter @jamesmunns @korken89 @ryankurte @thejpster @therealprof, @rust-lang/infra). 🎉 embedded-book on linux: test-fail → test-pass (cc @adamgreig @andre-richter @jamesmunns @korken89 @ryankurte @thejpster @therealprof, @rust-lang/infra).

gnzlbg and others added 29 commits March 26, 2019 11:03

Update jemalloc-sys to version 0.3.0

6ea6e62

Update Cargo.lock

b73886d

Update rustfmt to 1.2.0

c728ae0

Add a test

d59b46f

Better diagnostic for binary operation on BoxedValues

4d648ce

Update books

5113e73

Visit ItemKind::Impl for dead code lint

b3011dd

Add a regression test for rust-lang#47131

40db575

Do not suggest borrowing when the span comes from a macro

0acb786

Add test

925ca49

Update stdsimd

81402db

Add edition-guide to toolstate.

7a5c82d

Also, add me to reference, alercah has taken a step back from involvement.

Add check for when left and right overlap and change span for explana…

4644c3a

…tion to point at operator

Walk all items for dead_code lint by default

8cdfad9

Rename type_parameters to generics and so on

44813df

review comments

e13e9a5

Add comemnts clarifying logic

8fad69c

Fix MultilineAnnotation field name

b5690c2

Fix error in Rust 2018 + no_core environment

362d243

Rollup merge of rust-lang#59436 - gnzlbg:update_jemalloc, r=alexcrichton

8e0855b

Update jemalloc-sys to version 0.3.0 This PR updates jemalloc-sys from 0.1.8 to 0.3.0.

Rollup merge of rust-lang#59467 - hgallagher1993:local_branch, r=este…

fda2066

…bank Better diagnostic for binary operation on BoxedValues Fixes rust-lang#59458

Rollup merge of rust-lang#59473 - estebank:borrow-sugg-inside-macro, …

c105f34

…r=davidtwco Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans Fix rust-lang#58298.

Rollup merge of rust-lang#59480 - gnzlbg:us, r=alexcrichton

ee17267

Update stdsimd This PR fixes a regression introduced by ACLE support on thumbv4 targets, see: rust-lang/stdarch#704 .

Rollup merge of rust-lang#59486 - varkor:dead-code-impl, r=sanxiyn

4aacc49

Visit `ImplItem` in `dead_code` lint Fixes rust-lang#47131.

Rollup merge of rust-lang#59510 - varkor:rename-type_parameters, r=eddyb

99e886d

Rename `type_parameters` to `generics` and so on Some old variable names had fallen through the generics generalisation pull requests.

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 29, 2019

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 29, 2019

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 Mar 29, 2019

Centril mentioned this pull request Mar 29, 2019

Spurious "Command exited with code 259" on AppVeyor #58160

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2019

bors mentioned this pull request Mar 29, 2019

Visit ImplItem in dead_code lint #59486

Merged

bors merged commit 99e886d into rust-lang:master Mar 29, 2019

bors mentioned this pull request Mar 29, 2019

Update stdsimd #59480

Merged

This was referenced Mar 29, 2019

Update jemalloc-sys to version 0.3.0 #59436

Merged

Lint for redundant imports #58805

Merged

Update cargo #59516

Merged

Centril deleted the rollup branch March 29, 2019 22:18

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

Uh oh!

Rollup of 9 pull requests #59522

Rollup of 9 pull requests #59522

Uh oh!

Centril commented Mar 29, 2019

Uh oh!

Centril commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

fortanix-bot commented Mar 29, 2019

Uh oh!

Centril commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

Centril commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

rust-highfive commented Mar 29, 2019

Uh oh!

Uh oh!

Rollup of 9 pull requests #59522

Rollup of 9 pull requests #59522

Uh oh!

Conversation

Centril commented Mar 29, 2019

Uh oh!

Centril commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

fortanix-bot commented Mar 29, 2019

Uh oh!

Centril commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

Centril commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

rust-highfive commented Mar 29, 2019

Uh oh!

Uh oh!