Rollup of 12 pull requests by matklad · Pull Request #76322 · rust-lang/rust

matklad · 2020-09-04T09:19:04Z

Successful merges:

Unstable Book: add links to tracking issues for FFI features #75954 (Unstable Book: add links to tracking issues for FFI features)
impl Rc::new_cyclic #75994 (impl Rc::new_cyclic)
Link vec doc to & reference #76060 (Link vec doc to & reference)
Use Arc::clone and Rc::clone in documentation #76128 (Use Arc::clone and Rc::clone in documentation)
Add missing link in README #76229 (Add missing link in README)
Move some Vec UI tests into alloc unit tests #76273 (Move some Vec UI tests into alloc unit tests)
Allow try blocks as the argument to return expressions #76274 (Allow try blocks as the argument to return expressions)
Rename IsJoint -> Spacing #76291 (Rename IsJoint -> Spacing )
Make Ipv4Addr and Ipv6Addr const tests unit tests under library #76299 (Make Ipv4Addr and Ipv6Addr const tests unit tests under library)
Address review comments on Peekable::next_if #76302 (Address review comments on Peekable::next_if)
Link to #capacity-and-reallocation when using with_capacity #76303 (Link to #capacity-and-reallocation when using with_capacity)
Move various ui const tests to library #76305 (Move various ui const tests to library)

Failed merges:

r? @ghost

Co-authored-by: Andrew Hickman <andrew.hickman1@sky.com>

It is not always obvious that people could see the docs for `&` especially for beginners, it also helps learnability.

…brary

Fixes 76271

To match better naming from proc-macro

These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.

Move: - `src\test\ui\consts\const-nonzero.rs` to `library\core` - `src\test\ui\consts\ascii.rs` to `library\core` - `src\test\ui\consts\cow-is-borrowed` to `library\alloc` Part of rust-lang#76268

…ing_issues, r=steveklabnik Unstable Book: add links to tracking issues for FFI features

@Dylan-DPC

`impl Rc::new_cyclic` References rust-lang#75861 r? @Dylan-DPC

Link vec doc to & reference It is not always obvious that people could see the docs for `&` especially for beginners, it also helps learnability.

@rustbot

…odrAus Use Arc::clone and Rc::clone in documentation This PR replaces uses of `x.clone()` by `Rc::clone(&x)` (or `Arc::clone(&x)`) to better match the documentation for those types. @rustbot modify labels: T-doc

Add missing link in README

Move some Vec UI tests into alloc unit tests A bit of work towards rust-lang#76268, makes a number of the Vec UI tests that are simply running code into unit tests. Ensured that they are being run when testing liballoc locally.

Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).

@petrochenkov

Rename IsJoint -> Spacing Builds on rust-lang#76286 and might conflict with rust-lang#76285 r? @petrochenkov

Make `Ipv4Addr` and `Ipv6Addr` const tests unit tests under `library` These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.

@pickfire

Address review comments on `Peekable::next_if` r? @pickfire See rust-lang#72310 (review) for context.

@pickfire

Link to `#capacity-and-reallocation` when using with_capacity Follow up to rust-lang#76058 (comment). r? @pickfire

@matklad

Move various ui const tests to `library` Move: - `src\test\ui\consts\const-nonzero.rs` to `library\core` - `src\test\ui\consts\ascii.rs` to `library\core` - `src\test\ui\consts\cow-is-borrowed` to `library\alloc` Part of rust-lang#76268 r? @matklad

matklad · 2020-09-04T09:19:15Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=12

bors · 2020-09-04T09:19:16Z

📌 Commit 9e1cd5f has been approved by matklad

bors · 2020-09-04T09:25:07Z

⌛ Testing commit 9e1cd5f with merge f5cd213547620d250defdc2fd107f70942ba57e2...

bors · 2020-09-04T10:30:34Z

💔 Test failed - checks-actions

matklad · 2020-09-04T10:43:25Z

https://github.com/rust-lang-ci/rust/runs/1071200217#step:23:20475

Seems like the order of tests run by rustdoc changed, but I have no idea what might have caused this

matklad · 2020-09-04T11:13:43Z

locally, the test passes :( @jyn514 do you by any chance know what might be the problem here?

matklad · 2020-09-04T11:15:59Z

run out of steam for rollups for today, so closing this one!

jyn514 · 2020-09-04T12:02:53Z

diff of stdout:
1
2	running 2 tests
-	test $DIR/failed-doctest-output.rs - OtherStruct (line 21) ... FAILED
4	test $DIR/failed-doctest-output.rs - SomeStruct (line 11) ... FAILED
+	test $DIR/failed-doctest-output.rs - OtherStruct (line 21) ... FAILED
5
6	failures:
7
-	---- $DIR/failed-doctest-output.rs - OtherStruct (line 21) stdout ----
-	error[E0425]: cannot find value `no` in this scope
- --> $DIR/failed-doctest-output.rs:22:1
- |
-	LL | no
- | ^^ not found in this scope
-
-	error: aborting due to previous error
-
-	For more information about this error, try `rustc --explain E0425`.
-	Couldn't compile the test.
19	---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ----
20	Test executable failed (exit code 101).
21
30	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
31
32
+	---- $DIR/failed-doctest-output.rs - OtherStruct (line 21) stdout ----
+	error[E0425]: cannot find value `no` in this scope
+ --> $DIR/failed-doctest-output.rs:22:1
+ |
+	LL | no
+ | ^^ not found in this scope
+
+	error: aborting due to previous error
+
+	For more information about this error, try `rustc --explain E0425`.
+	Couldn't compile the test.
33
34	failures:
35 $DIR/failed-doctest-output.rs - OtherStruct (line 21)

It looks like the order rustdoc runs doctests is non-deterministic? I'm not sure why though ...

jyn514 · 2020-09-04T12:03:50Z

locally, the test passes

Might have something to do with the CI runner having so many cores, I think GitHub Actions has 64 or something insane like that

ArekPiekarzand others added 30 commits August 26, 2020 22:03

Unstable Book: add links to tracking issues for FFI features
aa40c02

impl Rc::new_cyclic
f03d0b3

typo
42fb270
Co-authored-by: Andrew Hickman <andrew.hickman1@sky.com>

Link vec doc to & reference
bb5e79c
It is not always obvious that people could see the docs for `&` especially for beginners, it also helps learnability.

Try removing [prim@reference]
20a6866

Move to Arc::clone(&x) over x.clone() in library/std
81e85ce

Move to Arc::clone(&x) over x.clone() in library/core
6b75e3d

Removed [inline] and copied over comments from Arc::new_cyclic
0f301e8

Add missing link in README
8783c62

Remove a number of vec UI tests, make them unit tests in the alloc li…
3e29fdb
…brary

Allow try blocks as the argument to return expressions
791f93c
Fixes 76271

Condense StringReader's API to a single function
4231fbc

Link & primitive using relative link
4df6490

Rename IsJoint -> Spacing
ccf41dd
To match better naming from proc-macro

Remove vec-to_str.rs, merge the remaining test in with vec
2278c72

Make Ipv4Addr and Ipv6Addr const tests unit tests under library
a2e077e
These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.

Address review comments on Peekable::next_if
8c93125

Link to #capacity-and-reallocation when using with_capacity
7b823df

Move various ui const tests to library
538e198
Move: - `src\test\ui\consts\const-nonzero.rs` to `library\core` - `src\test\ui\consts\ascii.rs` to `library\core` - `src\test\ui\consts\cow-is-borrowed` to `library\alloc` Part of rust-lang#76268

Add slice primitive link to vec
85146b9

Rollup merge ofrust-lang#75954- ArekPiekarz:unstable_book_ffi_track…
0e21b31
…ing_issues, r=steveklabnik Unstable Book: add links to tracking issues for FFI features

Rollup merge ofrust-lang#75994- mental32:impl-rc-new-cyclic, r=KodrAus
0523299
`impl Rc::new_cyclic` References rust-lang#75861 r? @Dylan-DPC

Rollup merge ofrust-lang#76060- pickfire:patch-12, r=jyn514
e048bd1
Link vec doc to & reference It is not always obvious that people could see the docs for `&` especially for beginners, it also helps learnability.

Rollup merge ofrust-lang#76128- poliorcetics:doc-use-arc-clone, r=K…
693f89a
…odrAus Use Arc::clone and Rc::clone in documentation This PR replaces uses of `x.clone()` by `Rc::clone(&x)` (or `Arc::clone(&x)`) to better match the documentation for those types. @rustbot modify labels: T-doc

Rollup merge ofrust-lang#76229- camelid:patch-3, r=jonas-schievink
9567d3e
Add missing link in README

Rollup merge ofrust-lang#76291- matklad:spacing, r=petrochenkov
b1101dc
Rename IsJoint -> Spacing Builds on rust-lang#76286 and might conflict with rust-lang#76285 r? @petrochenkov

Rollup merge ofrust-lang#76299- CDirkx:ip-tests, r=matklad
1242599
Make `Ipv4Addr` and `Ipv6Addr` const tests unit tests under `library` These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.

Rollup merge ofrust-lang#76302- jyn514:peekable-2, r=Dylan-DPC
b018ccf
Address review comments on `Peekable::next_if` r? @pickfire See rust-lang#72310 (review) for context.

matklad added 2 commits September 4, 2020 11:19

Rollup merge ofrust-lang#76303- jyn514:vec-assert-doc, r=Dylan-DPC
1d19128
Link to `#capacity-and-reallocation` when using with_capacity Follow up to rust-lang#76058 (comment). r? @pickfire

rustbot added the rollup A PR which is a rollup label Sep 4, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 4, 2020

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 Sep 4, 2020

matklad closed this Sep 4, 2020

Navigation Menu

Uh oh!

Uh oh!

Rollup of 12 pull requests - #76322

Rollup of 12 pull requests#76322
matklad wants to merge 32 commits into
rust-lang:masterfrom
matklad:rollup-4q9iwd0

matklad commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

jyn514 commented Sep 4, 2020

Uh oh!

jyn514 commented Sep 4, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Uh oh!

Conversation

matklad commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

matklad commented Sep 4, 2020

Uh oh!

jyn514 commented Sep 4, 2020

Uh oh!

jyn514 commented Sep 4, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants