Rollup of 7 pull requests #70637

Dylan-DPC-zz · 2020-03-31T22:19:35Z

Successful merges:

BTreeMap/BTreeSet: implement drain_filter #68770 (BTreeMap/BTreeSet: implement drain_filter )
add unused_braces lint #70081 (add unused_braces lint)
parse_and_disallow_postfix_after_cast: account for ExprKind::Err. #70556 (parse_and_disallow_postfix_after_cast: account for ExprKind::Err.)
Add missing -lmsvcrt on mingw after -lpthread #70605 (Add missing -lmsvcrt on mingw after -lpthread)
Update books. #70630 (Update books.)
expand vec![] to Vec::new() #70632 (expand vec![] to Vec::new())
Remove some reexports in rustc_middle #70634 (Remove some reexports in rustc_middle)

Failed merges:

BTreeMap/BTreeSet: implement drain_filter Provide an implementation of drain_filter for BTreeMap and BTreeSet. Should be optimal when the predicate picks only elements in leaf nodes with at least MIN_LEN remaining elements, which is a common case, at least when draining only a fraction of the map/set, and also when the predicate picks elements stored in internal nodes where the right subtree can easily let go of a replacement element. The first commit adds benchmarks with an external, naive implementation. to compare how much this claimed optimality-in-some-cases is actually worth.

@varkor

add `unused_braces` lint Add the lint `unused_braces` which is warn by default. `unused_parens` is also extended and now checks anon consts. closes rust-lang#68387 r? @varkor

@estebank

parse_and_disallow_postfix_after_cast: account for `ExprKind::Err`. Fixes rust-lang#70552. r? @estebank cc @daboross

Add missing -lmsvcrt on mingw after -lpthread Fixes rust-lang#70316

Update books. ## reference 2 commits in e2f11fe..89dd146 2020-03-10 06:59:24 +0100 to 2020-03-31 09:42:10 -0700 - Clarify rule for end-of-line backslashes in strings (rust-lang/reference#784) - Fix and clarify section on re-export (rust-lang/reference#780) ## book 1 commits in 6fb3705e5230311b096d47f7e2c91f9ce24393d0..c8841f2841a2d26124319ddadd1b6a245f9a1856 2020-02-12 13:48:57 -0500 to 2020-03-22 09:07:01 -0500 - Fix broken front_of_house.rs test on nightly. (rust-lang/book#2289) ## rust-by-example 7 commits in cb369ae95ca36b841960182d26f6d5d9b2e3cc18..edd2a7e687358712608896730c083cb76c7b401a 2020-03-14 12:13:22 -0500 to 2020-03-30 09:37:29 -0300 - feat: add doc attributes section to documentation (rust-lang/rust-by-example#1323) - feat: add playpen topic (rust-lang/rust-by-example#1324) - feat: add sentence about rustdoc & std library (rust-lang/rust-by-example#1322) - fix: make spelling/style of rustdoc consistent (rust-lang/rust-by-example#1321) - Rewrite section on 'static lifetime. (rust-lang/rust-by-example#1320) - Remove deprecated `std::error::Error` functions and other minor changes (rust-lang/rust-by-example#1319) - Remove mdbook version flags from README (rust-lang/rust-by-example#1318) ## nomicon 1 commits in 9f797e65e6bcc79419975b17aff8e21c9adc039f..411197b0e77590c967e37e8f6ec681abd359afe8 2020-03-04 03:45:13 +0100 to 2020-03-31 20:46:09 +0200 - Fix negative_impls feature. (rust-lang/nomicon#205)

expand vec![] to Vec::new() The current expansion of `vec![]` calls `into_vec` on a boxed slice, which results in longer IR, and even after optimization, some unwinding artifacts are still present in the IR. This PR uses `Vec::new()` for `vec![]`. This also allows `vec![]` to be used in const expressions.

…ulacrum Remove some reexports in `rustc_middle` This will help get these imports out of the way of detecting the true dependencies in and out to `rustc_middle`, thereby helping future work towards rust-lang#65031.

Dylan-DPC-zz · 2020-03-31T22:19:55Z

@bors r+ p=7 rollup=never

bors · 2020-03-31T22:19:56Z

📌 Commit a176bd2 has been approved by Dylan-DPC

bors · 2020-03-31T22:20:49Z

⌛ Testing commit a176bd2 with merge 3b9c0e3d7b0c33b120f8a7d974e6f5d010998879...

rust-highfive · 2020-03-31T22:23:21Z

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-31T22:22:35.9454834Z ========================== Starting Command Output ===========================
2020-03-31T22:22:35.9457282Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/753728db-95c0-495c-9c83-c8674b89f442.sh
2020-03-31T22:22:35.9457565Z 
2020-03-31T22:22:35.9461357Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-31T22:22:35.9479878Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70637/merge to s
2020-03-31T22:22:35.9482915Z Task         : Get sources
2020-03-31T22:22:35.9483202Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-31T22:22:35.9483483Z Version      : 1.0.0
2020-03-31T22:22:35.9483672Z Author       : Microsoft
---
2020-03-31T22:22:36.9423266Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-31T22:22:36.9429553Z ##[command]git config gc.auto 0
2020-03-31T22:22:36.9433929Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-31T22:22:36.9438305Z ##[command]git config --get-all http.proxy
2020-03-31T22:22:36.9445974Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70637/merge:refs/remotes/pull/70637/merge
2020-03-31T22:22:37.2949731Z fatal: couldn't find remote ref refs/pull/70637/merge
2020-03-31T22:22:37.3762321Z ##[warning]Git fetch failed with exit code 128, back off 3.622 seconds before retry.
2020-03-31T22:22:40.9364323Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70637/merge:refs/remotes/pull/70637/merge
2020-03-31T22:22:41.9366454Z fatal: couldn't find remote ref refs/pull/70637/merge
2020-03-31T22:22:41.9952808Z ##[warning]Git fetch failed with exit code 128, back off 1.611 seconds before retry.
2020-03-31T22:22:43.1309879Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70637/merge:refs/remotes/pull/70637/merge
2020-03-31T22:22:43.7336961Z fatal: couldn't find remote ref refs/pull/70637/merge
2020-03-31T22:22:43.7899879Z ##[error]Git fetch failed with exit code: 128
2020-03-31T22:22:43.7914215Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70637/merge to s
2020-03-31T22:22:43.8326808Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70637/merge to s
2020-03-31T22:22:43.8332079Z Task         : Get sources
2020-03-31T22:22:43.8332407Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-31T22:22:43.8332729Z Version      : 1.0.0
2020-03-31T22:22:43.8332958Z Author       : Microsoft
2020-03-31T22:22:43.8332958Z Author       : Microsoft
2020-03-31T22:22:43.8333290Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-31T22:22:43.8333675Z ==============================================================================
2020-03-31T22:22:44.1238871Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70637/merge to s
2020-03-31T22:22:44.1319913Z Cleaning up task key
2020-03-31T22:22:44.1321265Z Start cleaning up orphan processes.
2020-03-31T22:22:44.1453113Z ##[section]Finishing: Finalize Job
2020-03-31T22:22:44.1493390Z ##[section]Finishing: Linux x86_64-gnu-tools

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)

lcnr and others added 24 commits March 27, 2020 22:50

add visit_anon_const to EarlyContextAndPass

e0a0835

add unused_braces, lint anon_const

b3d744c

Add benchmarks of drain_filter-like behaviour

a6cae3d

BTreeMap/BTreeSet: implement and test drain_filter

0405db3

parse_and_disallow_postfix_after_cast: account for ExprKind::Err.

96d7353

Add missing -lmsvcrt on mingw after -lpthread

1ae3b50

Fixes rust-lang#70316

nix rustc_target::abi::* reexport in ty::layout

84d68c5

fix internal lint fallout

21c5cca

update tests

698b20e

add tests for unused_braces

bcf35b1

update unused_braces wording

bab327c

Update books.

722d3d8

use direct import for ErrorReported

22870f8

expand vec![] to Vec::new()

4d8273d

direct imports for langitem stuff

2027ea0

nix CachingSourceMapView reexport

316c240

fix fulldeps test fallout

d796b7a

Rollup merge of rust-lang#70081 - lcnr:issue68387, r=varkor

0eb52b0

add `unused_braces` lint Add the lint `unused_braces` which is warn by default. `unused_parens` is also extended and now checks anon consts. closes rust-lang#68387 r? @varkor

Rollup merge of rust-lang#70556 - Centril:fix-70552, r=estebank

f2d08ab

parse_and_disallow_postfix_after_cast: account for `ExprKind::Err`. Fixes rust-lang#70552. r? @estebank cc @daboross

Rollup merge of rust-lang#70605 - Amanieu:pthread_msvcrt, r=varkor

63bf4e9

Add missing -lmsvcrt on mingw after -lpthread Fixes rust-lang#70316

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 31, 2020

Dylan-DPC-zz closed this Mar 31, 2020

Dylan-DPC-zz deleted the rollup-j3a652d branch April 1, 2020 20:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #70637

Rollup of 7 pull requests #70637

Dylan-DPC-zz commented Mar 31, 2020

Dylan-DPC-zz commented Mar 31, 2020

bors commented Mar 31, 2020

bors commented Mar 31, 2020

rust-highfive commented Mar 31, 2020

Rollup of 7 pull requests #70637

Rollup of 7 pull requests #70637

Conversation

Dylan-DPC-zz commented Mar 31, 2020

Dylan-DPC-zz commented Mar 31, 2020

bors commented Mar 31, 2020

bors commented Mar 31, 2020

rust-highfive commented Mar 31, 2020