Rollup of 9 pull requests #70033

Dylan-DPC-zz · 2020-03-15T20:48:53Z

Successful merges:

Refactor the Qualif trait #67335 (Refactor the Qualif trait)
Use pprust to print attributes in rustdoc #69686 (Use pprust to print attributes in rustdoc)
Make methods declared by newtype_index macro const #69899 (Make methods declared by newtype_index macro const)
Cleanup E0412 and E0422 #69917 (Cleanup E0412 and E0422)
Add Node.js to PR CI image #69964 (Add Node.js to PR CI image)
Block version-specific docs from search engines #69992 (Block version-specific docs from search engines)
Add more context to the literal overflow message #69995 (Add more context to the literal overflow message)
Add long error explanation for E0634 #69998 (Add long error explanation for E0634)
Small fixes in rustdoc book #70014 (Small fixes in rustdoc book)

Failed merges:

r? @ghost

This should allow the `rustdoc-js` and `rustdoc-js-std` test suites to run automatically on PRs.

… location

Stable, beta and nightly URLs remain

Co-Authored-By: Dylan DPC <[email protected]>

@eddyb

…ddyb Refactor the `Qualif` trait This PR attempts to preserve the existing semantics of the `Qualif` trait while reducing its API to two significant methods with descriptive names, `in_any_value_of_ty` and `in_adt_inherently`. The other `in_*` methods have been made into free functions, since they should never be overloaded. Finally, I changed the bounds on the `in_local` argument to be less restrictive (`FnMut` instead of `Fn`), which addresses a FIXME in the const-checker. r? @eddyb cc @pnkfelix @oli-obk

@GuillaumeGomez

…umeGomez Use `pprust` to print attributes in rustdoc Fixes rust-lang#69559. I'm not sure what the original motivation was for the `render_attribute`, so I may be missing something, but replacing it with `pprust::attribute_to_string` seems to give the intended output (modulo some spacing idiosyncrasies). r? @GuillaumeGomez

…=oli-obk Make methods declared by `newtype_index` macro `const` Crates that use the macro to define an `Idx` type need to enable `#![feature(const_if_match, const_panic)]`.

@Dylan-DPC

…an-DPC Cleanup E0412 and E0422 r? @Dylan-DPC

…m,GuillaumeGomez Add Node.js to PR CI image This should allow the `rustdoc-js` and `rustdoc-js-std` test suites to run automatically on PRs.

Block version-specific docs from search engines Latest stable, beta and nightly URLs remain accessible because their URLs don't start with a version number. Robots.txt uses simple path prefixes, so it's OK that the disallow rules aren't full directory paths. Direct links to old docs remain accessible to users, because robots.txt only affects crawlers. With this change old docs for specific old versions of Rust won't pop up in search results. This is good, because users won't be getting obsolete documentation by accident.

…flow, r=ecstatic-morse Add more context to the literal overflow message related to issue rust-lang#63733

@GuillaumeGomez

…error-code-e0634, r=Dylan-DPC,GuillaumeGomez Add long error explanation for E0634 Add long explanation for the E0634 error code Part of rust-lang#61137 r? @GuillaumeGomez

…ok, r=Dylan-DPC Small fixes in rustdoc book I read the `rustdoc` book today and noticed some small typos/problems. Mainly: - `# fn foo() {}` was displayed when not needed because fenced block code type was `text` instead of `rust`; - two path separators were missing and some Windows-style separators were not consistent with the rest of them (mainly Linux-style). Here are my proposed fixes. It is my first PR for the rust project. Don't hesitate to tell me if I am doing it wrong or if you need anything else. Have a nice day!

Dylan-DPC-zz · 2020-03-15T20:49:18Z

@bors r+ rollup=never p=9

bors · 2020-03-15T20:49:20Z

📌 Commit b543b99 has been approved by Dylan-DPC

bors · 2020-03-15T23:49:30Z

⌛ Testing commit b543b99 with merge a70c07b9d5509a9af1dc18340de99360521bbe91...

rust-highfive · 2020-03-16T00:03:18Z

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

2020-03-15T23:57:26.2349212Z     Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
2020-03-15T23:57:28.5509707Z     Checking rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
2020-03-15T23:57:29.2342262Z     Checking rustc_expand v0.0.0 (/checkout/src/librustc_expand)
2020-03-15T23:57:30.6355790Z     Checking rustc_builtin_macros v0.0.0 (/checkout/src/librustc_builtin_macros)
2020-03-15T23:57:33.8973180Z error[E0599]: no function or associated item named `from_u32_const` found for struct `rustc_hir::hir_id::ItemLocalId` in the current scope
2020-03-15T23:57:33.8975017Z    --> src/librustc/hir/map/mod.rs:348:40
2020-03-15T23:57:33.8976044Z     |
2020-03-15T23:57:33.8977419Z 348 |         if id.local_id == ItemLocalId::from_u32_const(0) {
2020-03-15T23:57:33.8979807Z     |                                        ^^^^^^^^^^^^^^ function or associated item not found in `rustc_hir::hir_id::ItemLocalId`
2020-03-15T23:57:40.7513655Z error: aborting due to previous error
2020-03-15T23:57:40.7514830Z 
2020-03-15T23:57:40.7515825Z For more information about this error, try `rustc --explain E0599`.
2020-03-15T23:57:40.7757183Z error: could not compile `rustc`.
2020-03-15T23:57:40.7757183Z error: could not compile `rustc`.
2020-03-15T23:57:40.7758036Z 
2020-03-15T23:57:40.7759194Z To learn more, run the command again with --verbose.
2020-03-15T23:57:40.7788472Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-03-15T23:57:40.7793306Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2020-03-15T23:57:40.7794002Z Build completed unsuccessfully in 0:03:57
2020-03-15T23:57:40.7851731Z == clock drift check ==
2020-03-15T23:57:40.7867815Z   local time: Sun Mar 15 23:57:40 UTC 2020
2020-03-15T23:57:40.7867815Z   local time: Sun Mar 15 23:57:40 UTC 2020
2020-03-15T23:57:41.0576523Z   network time: Sun, 15 Mar 2020 23:57:41 GMT
2020-03-15T23:57:41.0584591Z == end clock drift check ==
2020-03-15T23:57:41.9910900Z 
2020-03-15T23:57:41.9978794Z ##[error]Bash exited with code '1'.
2020-03-15T23:57:42.0047252Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-15T23:57:42.0051901Z ==============================================================================
2020-03-15T23:57:42.0052561Z Task         : Get sources
2020-03-15T23:57:42.0052959Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

bors · 2020-03-16T00:03:36Z

💔 Test failed - checks-azure

ollie27 and others added 28 commits March 12, 2020 22:55

Add Node.js to PR CI image

965888a

This should allow the `rustdoc-js` and `rustdoc-js-std` test suites to run automatically on PRs.

Allow rustdoc-js and rustdoc-js-std to use none default build dir…

3f58ab6

… location

Block version-specific docs from search engines

a5a786d

Stable, beta and nightly URLs remain

Add long error explanation for E0634 rust-lang#61137

4bd6ebc

Make newtype_index methods const

efd3952

Rename from_u32_const -> from_u32

680aa06

Add requisite feature gates for const assert

1f7b537

Hold index of generator self arg in const

08d345e

Clean up path separator in rustdoc book

68dc24f

Clean up E0412 and E0422 explanations

ecb84c9

Simplify Qualif interface

6f75d3f

Change fenced code block type in rustdoc book

131433a

Fix punctuation in rustdoc book

6d521ec

Update ui tests

138d29d

Update src/librustc_error_codes/error_codes/E0634.md

5760db1

Co-Authored-By: Dylan DPC <[email protected]>

Update src/librustc_error_codes/error_codes/E0634.md

2974685

Co-Authored-By: Dylan DPC <[email protected]>

Add more context to the literal overflow message

a4ffbaa

Render full attributes in rustdoc

621c42c

Add FIXME note

c599ec4

Rollup merge of rust-lang#69899 - ecstatic-morse:const-idx-methods, r…

513702d

…=oli-obk Make methods declared by `newtype_index` macro `const` Crates that use the macro to define an `Idx` type need to enable `#![feature(const_if_match, const_panic)]`.

Rollup merge of rust-lang#69917 - GuillaumeGomez:cleanup-e0412, r=Dyl…

1984cbd

…an-DPC Cleanup E0412 and E0422 r? @Dylan-DPC

Rollup merge of rust-lang#69964 - ollie27:ci_nodejs, r=Mark-Simulacru…

dd5c112

…m,GuillaumeGomez Add Node.js to PR CI image This should allow the `rustdoc-js` and `rustdoc-js-std` test suites to run automatically on PRs.

Rollup merge of rust-lang#69995 - contrun:add-context-to-literal-over…

ed37191

…flow, r=ecstatic-morse Add more context to the literal overflow message related to issue rust-lang#63733

Rollup merge of rust-lang#69998 - ayushmishra2005:doc/61137-add-long-…

d733285

…error-code-e0634, r=Dylan-DPC,GuillaumeGomez Add long error explanation for E0634 Add long explanation for the E0634 error code Part of rust-lang#61137 r? @GuillaumeGomez

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 15, 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 Mar 16, 2020

Dylan-DPC-zz closed this Mar 16, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #70033

Rollup of 9 pull requests #70033

Dylan-DPC-zz commented Mar 15, 2020

Dylan-DPC-zz commented Mar 15, 2020

bors commented Mar 15, 2020

bors commented Mar 15, 2020

rust-highfive commented Mar 16, 2020

bors commented Mar 16, 2020

Rollup of 9 pull requests #70033

Rollup of 9 pull requests #70033

Conversation

Dylan-DPC-zz commented Mar 15, 2020

Dylan-DPC-zz commented Mar 15, 2020

bors commented Mar 15, 2020

bors commented Mar 15, 2020

rust-highfive commented Mar 16, 2020

bors commented Mar 16, 2020