Rollup of 7 pull requests #65878

Centril · 2019-10-27T19:43:13Z

Successful merges:

Add #[must_use] to all functions 'fn(float) -> float' #63871 (Add #[must_use] to all functions 'fn(float) -> float')
Stabilize Option::flatten #64747 (Stabilize Option::flatten)
Point at local similarly named element and tweak references to variants #65421 (Point at local similarly named element and tweak references to variants)
rustc, rustc_passes: reduce deps on rustc_expand #65792 (rustc, rustc_passes: reduce deps on rustc_expand)
librustc_lexer: Enhance documentation #65849 (librustc_lexer: Enhance documentation)
doc: explain why it is unsafe to construct Vec<u8> from Vec<u16> #65873 (doc: explain why it is unsafe to construct Vec from Vec)
doc: introduce once in iter::chain document #65877 (doc: introduce once in iter::chain document)

Failed merges:

This is done by moving some data definitions to syntax::expand.

Apply review suggestions Apply review suggestions

Co-authored-by: Steve Klabnik <steve@steveklabnik.com>

Point at the span for the definition of ADTs internal to the current crate. Look at the leading char of the ident to determine whether we're expecting a likely fn or any of a fn, a tuple struct or a tuple variant. Turn fn `add_typo_suggestion` into a `Resolver` method.

…boats Add #[must_use] to all functions 'fn(float) -> float' These are pure functions. ```rust impl f32/f64 { fn floor(self) -> Self; fn ceil(self) -> Self; fn round(self) -> Self; fn trunc(self) -> Self; fn fract(self) -> Self; fn abs(self) -> Self; fn signum(self) -> Self; fn mul_add(self, a: Self, b: Self) -> Self; fn div_euclid(self, rhs: Self) -> Self; fn rem_euclid(self, rhs: Self) -> Self; fn powi(self, n: i32) -> Self; fn powf(self, n: Self) -> Self; fn sqrt(self) -> Self; fn exp(self) -> Self; fn exp2(self) -> Self; fn ln(self) -> Self; fn log(self, base: Self) -> Self; fn log2(self) -> Self; fn log10(self) -> Self; fn abs_sub(self, other: Self) -> Self; fn cbrt(self) -> Self; fn hypot(self, other: Self) -> Self; fn sin(self) -> Self; fn cos(self) -> Self; fn tan(self) -> Self; fn asin(self) -> Self; fn acos(self) -> Self; fn atan(self) -> Self; fn atan2(self, other: Self) -> Self; fn exp_m1(self) -> Self; fn ln_1p(self) -> Self; fn sinh(self) -> Self; fn cosh(self) -> Self; fn tanh(self) -> Self; fn asinh(self) -> Self; fn acosh(self) -> Self; fn atanh(self) -> Self; fn clamp(self, min: Self, max: Self) -> Self; } ``` Part of rust-lang#48926

@elahn

Stabilize `Option::flatten` - PR: rust-lang#60256 - Tracking issue: rust-lang#60258 @elahn > I was trying to `flat_map()` and found `map().flatten()` does the trick. This has been on nightly for 4 months, can we stabilise it? @ethanboxx > @Centril Helped me get this merged. What is the stabilization process? @Centril > @ethanboxx I'd just file a PR to stabilize it and we'll ask T-libs to FCP. So here I am. I am was unsure what number to put in `since = "-"` so I copied what someone had done in a recent PR.

Point at local similarly named element and tweak references to variants Partially address rust-lang#65386.

@petrochenkov

rustc, rustc_passes: reduce deps on rustc_expand Part of rust-lang#65324. r? @petrochenkov

@petrochenkov

…etrochenkov librustc_lexer: Enhance documentation This PR enhances documentation state of the `librustc_lexer` (as initiative caused by [rustc-guide#474](rust-lang/rustc-dev-guide#474)), by adding: - Module documentation. - Doc-comments (and a bit of usual comments) in non-obvious (as for me) places. r? @petrochenkov cc @Centril

…ruppe doc: explain why it is unsafe to construct Vec<u8> from Vec<u16>

doc: introduce `once` in `iter::chain` document I find it hard to find which one to use with `chain` when I only need to chain one value. Also [`once`][1] talks about `chain`. [1]: https://doc.rust-lang.org/nightly/std/iter/fn.once.html

Centril · 2019-10-27T19:43:27Z

@bors r+ p=7 rollup=never

bors · 2019-10-27T19:43:29Z

📌 Commit e5d8efc has been approved by Centril

bors · 2019-10-27T19:43:51Z

⌛ Testing commit e5d8efc with merge 6e3aa303432d57bcde7a0d90d65e902fbad81803...

rust-highfive · 2019-10-27T21:46:57Z

The job x86_64-mingw-1 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.

2019-10-27T19:45:25.8024663Z do so (now or later) by using -b with the checkout command again. Example:
2019-10-27T19:45:25.8024880Z 
2019-10-27T19:45:25.8024931Z   git checkout -b <new-branch-name>
2019-10-27T19:45:25.8024991Z 
2019-10-27T19:45:25.8025056Z HEAD is now at 6e3aa3034 Auto merge of #65878 - Centril:rollup-frxkcrv, r=Centril
2019-10-27T19:45:25.8420616Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-10-27T19:45:25.8534508Z ==============================================================================
2019-10-27T19:45:25.8534595Z Task         : Bash
2019-10-27T19:45:25.8534685Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-27T21:44:42.7711736Z ---- iter\traits\iterator.rs - iter::traits::iterator::Iterator::chain (line 431) stdout ----
2019-10-27T21:44:42.7711867Z error[E0412]: cannot find type `OsStr` in this scope
2019-10-27T21:44:42.7711952Z  --> iter\traits\iterator.rs:433:24
2019-10-27T21:44:42.7712051Z   |
2019-10-27T21:44:42.7712144Z 5 | fn os_str_to_utf16(s: &OsStr) -> Vec<u16> {
2019-10-27T21:44:42.7712337Z   |
2019-10-27T21:44:42.7712422Z help: possible candidate is found in another module, you can import it into scope
2019-10-27T21:44:42.7712527Z   |
2019-10-27T21:44:42.7712788Z 3 | use std::ffi::OsStr;
---
2019-10-27T21:44:42.7959262Z 
2019-10-27T21:44:42.7959321Z 
2019-10-27T21:44:42.8774172Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test --exclude src/test/ui --exclude src/test/compile-fail
2019-10-27T21:44:42.8774940Z Build completed unsuccessfully in 1:49:21
2019-10-27T21:44:42.9164561Z make: *** [Makefile:89: ci-mingw-subset-1] Error 1
2019-10-27T21:44:42.9914168Z   local time: Sun Oct 27 21:44:42 CUT 2019
2019-10-27T21:44:43.5516482Z   network time: Sun, 27 Oct 2019 21:44:43 GMT
2019-10-27T21:44:43.5528170Z == end clock drift check ==
2019-10-27T21:44:43.6246566Z 
2019-10-27T21:44:43.6246566Z 
2019-10-27T21:44:43.9778634Z ##[error]Bash exited with code '2'.
2019-10-27T21:44:44.0572757Z ##[section]Starting: Upload CPU usage statistics
2019-10-27T21:44:44.1421153Z ==============================================================================
2019-10-27T21:44:44.1421295Z Task         : Bash
2019-10-27T21:44:44.1421381Z Description  : Run a Bash script on macOS, Linux, or Windows

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 @TimNN. (Feature Requests)

bors · 2019-10-27T21:47:08Z

💔 Test failed - checks-azure

Kyle Strand and others added 19 commits August 24, 2019 14:58

Add 'must_use' to all functions 'fn(float) -> float'

6b02362

Add reason for each 'must_use'

ba2a1fa

Annotate functions taking extra args

c5b0003

Let 'clamp' be invoked without using return value; used in tests

54cb728

Restore 'must_use' for 'clamp'; fix warning for tests

1aa5d0c

Stabilize Option::flatten

65af429

syntax/attr: reduce reliance on parser

1632940

rustc, rustc_passes: don't depend on syntax_expand.

fb12c70

This is done by moving some data definitions to syntax::expand.

librustc_lexer: Enhance documentation

993b920

Apply review suggestions Apply review suggestions

doc: explain why it is unsafe to construct Vec<u8> from Vec<u16>

3f98078

Co-authored-by: Steve Klabnik <steve@steveklabnik.com>

doc: introduce once in iter::chain document

b626448

Rollup merge of rust-lang#65421 - estebank:variants, r=petrochenkov

af6b43a

Point at local similarly named element and tweak references to variants Partially address rust-lang#65386.

Rollup merge of rust-lang#65792 - Centril:split-syntax-2, r=petrochenkov

7e8599d

rustc, rustc_passes: reduce deps on rustc_expand Part of rust-lang#65324. r? @petrochenkov

Rollup merge of rust-lang#65873 - lzutao:doc-vec-from-raw-parts, r=rk…

5d09591

…ruppe doc: explain why it is unsafe to construct Vec<u8> from Vec<u16>

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 27, 2019

Centril added the rollup A PR which is a rollup label Oct 27, 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 Oct 27, 2019

Centril closed this Oct 27, 2019

Centril deleted the rollup-frxkcrv branch October 27, 2019 22:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #65878

Rollup of 7 pull requests #65878

Centril commented Oct 27, 2019

Centril commented Oct 27, 2019

bors commented Oct 27, 2019

bors commented Oct 27, 2019

rust-highfive commented Oct 27, 2019

bors commented Oct 27, 2019

Rollup of 7 pull requests #65878

Rollup of 7 pull requests #65878

Conversation

Centril commented Oct 27, 2019

Centril commented Oct 27, 2019

bors commented Oct 27, 2019

bors commented Oct 27, 2019

rust-highfive commented Oct 27, 2019

bors commented Oct 27, 2019