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 6 pull requests #86626

Closed
wants to merge 20 commits into from
Closed

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fee1-dead and others added 20 commits June 22, 2021 04:15
Due to the std/alloc split, it is not possible to make
`alloc::collections::TryReserveError::AllocError` non-exhaustive without
having an unstable, doc-hidden method to construct (which negates the
benefits from `#[non_exhaustive]`.
Commit e629381 removes the only place
these members variables are actually read.
Add `go_to_first` query param to jump to first result

Fixes rust-lang#84214

Note that while the issue initially wanted to navigate to an entry on exact match, the discussion settled on using a query parameter (`&go_to_first=true`) instead, regardless of exact or partial match.

Demonstration is attached

https://user-images.githubusercontent.com/4934853/120258768-7ff28980-c247-11eb-8c8f-1a2ceb242788.mp4
…tsakis

Change how edition based future compatibility warnings are handled

This fixes rust-lang#85894 by updating how future compatibility lints work. This makes it more apparent that future compatibility warnings can happen for several different reasons.

For now `FutureCompatibilityReasons` are limited to three reasons, but we can easily add more.

This also updates the generated warning for FCW's that signal code that will error in a future edition. This makes the diagnostics between FCWs at edition boundaries more distinct from those not happening at an edition boundary.

r? `@m-ou-se`
…=danielhenrymantilla

Rustdoc: Do not list impl when trait has doc(hidden)

Fixes rust-lang#86448.
Use `#[non_exhaustive]` where appropriate

Due to the std/alloc split, it is not possible to make `alloc::collections::TryReserveError::AllocError` non-exhaustive without having an unstable, doc-hidden method to construct (which negates the benefits from `#[non_exhaustive]`).

`@rustbot` label +C-cleanup +T-libs +S-waiting-on-review
…, r=jyn514

chore(rustdoc): remove unused members of RenderType

PR rust-lang#86561 removes the only place the `generics` member is read. This PR does even more cleanup.
…r=Amanieu

Update compiler-builtins

r? `@Amanieu`
@rustbot rustbot added the rollup A PR which is a rollup label Jun 25, 2021
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jun 25, 2021

📌 Commit fac113a has been approved by JohnTitor

@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 Jun 25, 2021
@bors
Copy link
Contributor

bors commented Jun 25, 2021

⌛ Testing commit fac113a with merge 87f62f38dade77b900d64245653730959e891c03...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-10 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
doc tests for: /checkout/src/doc/rustdoc/src/unstable-features.md
doc tests for: /checkout/src/doc/rustdoc/src/website-features.md


command did not execute successfully: "/checkout/obj/build/bootstrap/debug/rustdoc" "-Wrustdoc::invalid_codeblock_attributes" "-Dwarnings" "-Znormalize-docs" "-Z" "unstable-options" "--test" "/checkout/src/doc/rustdoc/src/website-features.md" "--test-args" ""

stdout ----

running 2 tests
running 2 tests
test /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 12) ... FAILED
test /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 17) ... FAILED
failures:


---- /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 12) stdout ----
error: expected expression, found `}`
 --> /checkout/src/doc/rustdoc/src/website-features.md:14:1
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() {
  |                                                                                                                - while parsing this struct
3 | https://doc.rust-lang.org/stable/std/?search=%s
4 | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() }


error: struct literal body without path
 --> /checkout/src/doc/rustdoc/src/website-features.md:12:112
  |
2 |   fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() {
  |  ________________________________________________________________________________________________________________^
3 | | https://doc.rust-lang.org/stable/std/?search=%s
4 | | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() }
  |
  |
help: you might have forgotten to add the struct literal inside the block
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() { SomeStruct {
3 | https://doc.rust-lang.org/stable/std/?search=%s
4 | } } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() }

error: aborting due to 2 previous errors

Couldn't compile the test.
Couldn't compile the test.
---- /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 17) stdout ----
error: expected expression, found `}`
 --> /checkout/src/doc/rustdoc/src/website-features.md:19:1
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() {
  |                                                                                                                - while parsing this struct
3 | https://doc.rust-lang.org/stable/std/?search=%s&go_to_first=true
4 | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() }


error: struct literal body without path
 --> /checkout/src/doc/rustdoc/src/website-features.md:17:112
  |
2 |   fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() {
  |  ________________________________________________________________________________________________________________^
3 | | https://doc.rust-lang.org/stable/std/?search=%s&go_to_first=true
4 | | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() }
  |
  |
help: you might have forgotten to add the struct literal inside the block
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() { SomeStruct {
3 | https://doc.rust-lang.org/stable/std/?search=%s&go_to_first=true
4 | } } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() }

error: aborting due to 2 previous errors

Couldn't compile the test.
Couldn't compile the test.

failures:
    /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 12)
    /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 17)
test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.04s


stderr ----

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-10 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

doc tests for: /checkout/src/doc/rustdoc/src/website-features.md

running 2 tests
test /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 12) ... FAILED
test /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 17) ... FAILED
failures:


---- /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 12) stdout ----
error: expected expression, found `}`
 --> /checkout/src/doc/rustdoc/src/website-features.md:14:1
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() {
  |                                                                                                                - while parsing this struct
3 | https://doc.rust-lang.org/stable/std/?search=%s
4 | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() }


error: struct literal body without path
 --> /checkout/src/doc/rustdoc/src/website-features.md:12:112
  |
2 |   fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() {
  |  ________________________________________________________________________________________________________________^
3 | | https://doc.rust-lang.org/stable/std/?search=%s
4 | | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() }
  |
  |
help: you might have forgotten to add the struct literal inside the block
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() { SomeStruct {
3 | https://doc.rust-lang.org/stable/std/?search=%s
4 | } } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_12_0() }

error: aborting due to 2 previous errors

Couldn't compile the test.
Couldn't compile the test.
---- /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 17) stdout ----
error: expected expression, found `}`
 --> /checkout/src/doc/rustdoc/src/website-features.md:19:1
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() {
  |                                                                                                                - while parsing this struct
3 | https://doc.rust-lang.org/stable/std/?search=%s&go_to_first=true
4 | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() }


error: struct literal body without path
 --> /checkout/src/doc/rustdoc/src/website-features.md:17:112
  |
2 |   fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() {
  |  ________________________________________________________________________________________________________________^
3 | | https://doc.rust-lang.org/stable/std/?search=%s&go_to_first=true
4 | | } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() }
  |
  |
help: you might have forgotten to add the struct literal inside the block
  |
2 | fn main() { #[allow(non_snake_case)] fn _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() { SomeStruct {
3 | https://doc.rust-lang.org/stable/std/?search=%s&go_to_first=true
4 | } } _doctest_main__checkout_src_doc_rustdoc_src_website_features_md_17_0() }

error: aborting due to 2 previous errors

Couldn't compile the test.
Couldn't compile the test.

failures:
    /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 12)
    /checkout/src/doc/rustdoc/src/website-features.md - Website_features::Custom_search_engines (line 17)
test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.04s




command did not execute successfully: "/checkout/obj/build/bootstrap/debug/rustdoc" "-Wrustdoc::invalid_codeblock_attributes" "-Dwarnings" "-Znormalize-docs" "-Z" "unstable-options" "--test" "/checkout/src/doc/rustdoc/src/website-features.md" "--test-args" ""


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --exclude src/tools/tidy
Build completed unsuccessfully in 0:30:34

@bors
Copy link
Contributor

bors commented Jun 25, 2021

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 25, 2021
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 25, 2021
@JohnTitor JohnTitor closed this Jun 25, 2021
@JohnTitor JohnTitor deleted the rollup-8jcidld branch June 25, 2021 15:37
@jeanlucthumm
Copy link
Contributor

Looks like the tests are interpreting my URL code snippet in the rustdoc book as rust code and trying to run it. I bet there's a way to make it ignore the code block, I'll do some digging.

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.

9 participants