Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 12 pull requests #76322

Closed
wants to merge 32 commits into from
Closed

Conversation

matklad
Copy link
Member

@matklad matklad commented Sep 4, 2020

Successful merges:

Failed merges:

r? @ghost

ArekPiekarz and others added 30 commits August 26, 2020 22:03
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.
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
Link vec doc to & reference

It is not always obvious that people could see the docs for `&`
especially for beginners, it also helps learnability.
…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
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

Fixes rust-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 }`).
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.
Address review comments on `Peekable::next_if`

r? @pickfire
See rust-lang#72310 (review) for context.
Link to `#capacity-and-reallocation` when using with_capacity

Follow up to rust-lang#76058 (comment).
r? @pickfire
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
Copy link
Member Author

matklad commented Sep 4, 2020

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

@bors
Copy link
Contributor

bors commented Sep 4, 2020

📌 Commit 9e1cd5f has been approved by matklad

@rustbot rustbot added the rollup A PR which is a rollup label Sep 4, 2020
@bors 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
Copy link
Contributor

bors commented Sep 4, 2020

⌛ Testing commit 9e1cd5f with merge f5cd213547620d250defdc2fd107f70942ba57e2...

@bors
Copy link
Contributor

bors commented Sep 4, 2020

💔 Test failed - checks-actions

@bors 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
Copy link
Member Author

matklad commented Sep 4, 2020

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
Copy link
Member Author

matklad commented Sep 4, 2020

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

@matklad
Copy link
Member Author

matklad commented Sep 4, 2020

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

@matklad matklad closed this Sep 4, 2020
@jyn514
Copy link
Member

jyn514 commented Sep 4, 2020

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
Copy link
Member

jyn514 commented Sep 4, 2020

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.