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 5 pull requests #66185

Closed
wants to merge 23 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Nov 7, 2019

Successful merges:

Failed merges:

r? @ghost

ehuss and others added 23 commits October 16, 2019 07:27
Add ERROR

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Have tidy ensure that we document all `unsafe` blocks in libcore

cc @rust-lang/libs

I documented a few and added ignore flags on the other files. We can incrementally document the files, but won't regress any files this way.
…, r=kinnison

[rustdoc] add sub settings

This PR is to give a finer control over what types are automatically expanded or not as well as the possibility to add sub-settings in the settings page.

![Screenshot from 2019-09-23 00-46-14](https://user-images.githubusercontent.com/3050060/65395521-15aff300-dd9c-11e9-9437-429ca347d455.png)

r? @Mark-Simulacrum
Stabilize --extern flag without a path.

This stabilizes the `--extern` flag without a path, implemented in rust-lang#54116.

This flag is used to add a crate that may be found in the search path to the extern prelude. The intent of stabilizing this now is to change Cargo to emit this flag for `proc_macro` when building a proc-macro crate. This will allow the ability to elide `extern crate proc_macro;` for proc-macros, one of the few places where it is still necessary.

It is intended that Cargo may also use this flag for other cases in the future as part of the [std-aware work](https://github.com/rust-lang/wg-cargo-std-aware/). There will likely be some kind of syntax where users may declare dependencies on other crates (such as `alloc`), and Cargo will use this flag so that they may be used like any other crate. At this time there are no short-term plans to use it for anything other than proc-macro.

This will not help for non-proc-macro crates that use `proc_macro`, which I believe is not too common?

An alternate approach for proc-macro is to use the `meta` crate, but from my inquiries there doesn't appear to be anyone interested in pushing that forward. The `meta` crate also doesn't help with things like `alloc` or `test`.

cc rust-lang#57288
consistent handling of missing sysroot spans

Due to rust-lang#53081, sysroot spans (pointing to code in libcore/libstd/...) fails to print on some x86 runners. This consolidates the ignore directives for that and references the relevant issue.

I also did that for the generated derive-error-span tests -- but there the script and the tests were not entirely in sync any more since rust-lang#64151. Cc @estebank @varkor
invalid_value lint: fix help text

Now that we also warn about `MaybUninit::uninit().assume_init()`, just telling people "use `MaybeUninit`" isn't always sufficient. And anyway this seems like an important enough point to mention it here.
@Centril
Copy link
Contributor Author

Centril commented Nov 7, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Nov 7, 2019

📌 Commit b94543b has been approved by Centril

@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 Nov 7, 2019
@Centril Centril added the rollup A PR which is a rollup label Nov 7, 2019
@bors
Copy link
Contributor

bors commented Nov 7, 2019

⌛ Testing commit b94543b with merge 90cbb9959e354780941ede793ab05d780e1d0b10...

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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-11-07T13:12:47.6869864Z    Compiling linkchecker v0.1.0 (/checkout/src/tools/linkchecker)
2019-11-07T13:12:49.5289182Z [RUSTC-TIMING] linkchecker test:false 1.840
2019-11-07T13:12:49.5300373Z     Finished release [optimized] target(s) in 1.97s
2019-11-07T13:12:49.5355400Z [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "linkchecker", path: "src/tools/linkchecker", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 1.986
2019-11-07T13:12:54.5755492Z rustc/command-line-arguments.html:164: id is not unique: `option-l-search-path`
2019-11-07T13:12:54.5770117Z rustc/print.html:212: id is not unique: `option-l-search-path`
2019-11-07T13:12:56.3229972Z thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:41:9
2019-11-07T13:12:56.3259766Z 
2019-11-07T13:12:56.3259902Z 
2019-11-07T13:12:56.3260448Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
2019-11-07T13:12:56.3260578Z expected success, got: exit code: 101
---
2019-11-07T13:12:56.3318398Z   local time: Thu Nov  7 13:12:56 UTC 2019
2019-11-07T13:12:56.5968169Z   network time: Thu, 07 Nov 2019 13:12:56 GMT
2019-11-07T13:12:56.5972463Z == end clock drift check ==
2019-11-07T13:13:01.8842474Z 
2019-11-07T13:13:01.8977190Z ##[error]Bash exited with code '1'.
2019-11-07T13:13:01.9010789Z ##[section]Starting: Checkout
2019-11-07T13:13:01.9012686Z ==============================================================================
2019-11-07T13:13:01.9012783Z Task         : Get sources
2019-11-07T13:13:01.9012852Z 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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 7, 2019

💔 Test failed - checks-azure

@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 Nov 7, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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-11-07T11:35:54.5167981Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-07T11:35:54.5183542Z ##[command]git config gc.auto 0
2019-11-07T11:35:54.5187521Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-07T11:35:54.5192006Z ##[command]git config --get-all http.proxy
2019-11-07T11:35:54.5194568Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66185/merge:refs/remotes/pull/66185/merge
---
2019-11-07T12:32:51.6533046Z .................................................................................................... 1600/9290
2019-11-07T12:32:56.9946927Z .................................................................................................... 1700/9290
2019-11-07T12:33:08.5882274Z ................................................................i................................... 1800/9290
2019-11-07T12:33:15.8476357Z .................................................................................................... 1900/9290
2019-11-07T12:33:29.6091728Z ................................................iiiii............................................... 2000/9290
2019-11-07T12:33:39.4023435Z .................................................................................................... 2200/9290
2019-11-07T12:33:41.6671503Z .................................................................................................... 2300/9290
2019-11-07T12:33:45.1137610Z .................................................................................................... 2400/9290
2019-11-07T12:34:06.9572727Z .................................................................................................... 2500/9290
---
2019-11-07T12:36:44.9245045Z .............................................i...............i...................................... 4800/9290
2019-11-07T12:36:53.4404183Z .................................................................................................... 4900/9290
2019-11-07T12:37:01.3196196Z .................................................................................................... 5000/9290
2019-11-07T12:37:07.5187234Z .................................................................................................... 5100/9290
2019-11-07T12:37:16.8064692Z ...............................................ii.ii...........i.................................... 5200/9290
2019-11-07T12:37:25.6648676Z .................................................................................................... 5400/9290
2019-11-07T12:37:35.4901724Z .................................................................................................... 5500/9290
2019-11-07T12:37:42.2653128Z .............................i...................................................................... 5600/9290
2019-11-07T12:37:48.2346144Z .................................................................................................... 5700/9290
2019-11-07T12:37:48.2346144Z .................................................................................................... 5700/9290
2019-11-07T12:37:59.3671058Z .................................................................................................... 5800/9290
2019-11-07T12:38:10.2479911Z ..............ii...i..ii...........i................................................................ 5900/9290
2019-11-07T12:38:29.1585624Z .................................................................................................... 6100/9290
2019-11-07T12:38:36.3648068Z .................................................................................................... 6200/9290
2019-11-07T12:38:36.3648068Z .................................................................................................... 6200/9290
2019-11-07T12:38:49.2266749Z .................................i..ii.............................................................. 6300/9290
2019-11-07T12:39:08.8694360Z .................................................................................................... 6500/9290
2019-11-07T12:39:10.8199886Z .i.................................................................................................. 6600/9290
2019-11-07T12:39:12.8477029Z .....................................................................................i.............. 6700/9290
2019-11-07T12:39:15.2629327Z .................................................................................................... 6800/9290
---
2019-11-07T12:44:12.6187804Z  finished in 5.214
2019-11-07T12:44:12.6353771Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:44:12.7906837Z 
2019-11-07T12:44:12.7907917Z running 156 tests
2019-11-07T12:44:15.5443334Z iiii....iii......iii..iiii...i.............................i..i..................i....i...........ii 100/156
2019-11-07T12:44:17.3759211Z .i.i..iiii..............i.........iii.i.........ii......
2019-11-07T12:44:17.3760205Z 
2019-11-07T12:44:17.3765600Z  finished in 4.741
2019-11-07T12:44:17.3935673Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:44:17.5457434Z 
---
2019-11-07T12:44:19.3911574Z  finished in 1.997
2019-11-07T12:44:19.4083927Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:44:19.5634123Z 
2019-11-07T12:44:19.5634553Z running 9 tests
2019-11-07T12:44:19.5635250Z iiiiiiiii
2019-11-07T12:44:19.5636022Z 
2019-11-07T12:44:19.5636091Z  finished in 0.154
2019-11-07T12:44:19.5822463Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:44:19.7421867Z 
---
2019-11-07T12:44:37.8411281Z  finished in 18.258
2019-11-07T12:44:37.8582678Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:44:38.0113678Z 
2019-11-07T12:44:38.0113819Z running 123 tests
2019-11-07T12:45:00.6564280Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-11-07T12:45:04.9624444Z i.i.i......iii.i.....ii
2019-11-07T12:45:04.9625771Z 
2019-11-07T12:45:04.9628792Z  finished in 27.104
2019-11-07T12:45:04.9638598Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:45:04.9639245Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-11-07T12:56:19.0662244Z 
2019-11-07T12:56:19.0663128Z    Doc-tests core
2019-11-07T12:56:23.6051971Z 
2019-11-07T12:56:23.6052742Z running 2417 tests
2019-11-07T12:56:33.4846685Z ......iiiii......................................................................................... 100/2417
2019-11-07T12:56:43.2134098Z ................................................................................ii.................. 200/2417
2019-11-07T12:57:05.8816617Z ..i................................................................................................. 400/2417
2019-11-07T12:57:05.8816617Z ..i................................................................................................. 400/2417
2019-11-07T12:57:15.2938038Z ..................................................i..i.................iiii......................... 500/2417
2019-11-07T12:57:32.9814196Z .................................................................................................... 700/2417
2019-11-07T12:57:42.0404047Z .................................................................................................... 800/2417
2019-11-07T12:57:51.2023847Z .................................................................................................... 900/2417
2019-11-07T12:58:00.4293404Z .................................................................................................... 1000/2417
---
2019-11-07T13:01:52.2423702Z 
2019-11-07T13:01:52.2438374Z running 1000 tests
2019-11-07T13:02:11.9619238Z i................................................................................................... 100/1000
2019-11-07T13:02:22.8838229Z .................................................................................................... 200/1000
2019-11-07T13:02:30.6290725Z ...................iii......i......i...i......i..................................................... 300/1000
2019-11-07T13:02:35.6380314Z .................................................................................................... 400/1000
2019-11-07T13:02:42.6219931Z ...........................................i..i.................................ii.................. 500/1000
2019-11-07T13:02:56.0839667Z .................................................................................................... 700/1000
2019-11-07T13:02:56.0839667Z .................................................................................................... 700/1000
2019-11-07T13:03:03.2941509Z ..........................iiii...................................................................... 800/1000
2019-11-07T13:03:18.4548595Z .................................................................................................... 900/1000
2019-11-07T13:03:25.9550705Z ................................................iiii................................................ 1000/1000
2019-11-07T13:03:25.9551654Z test result: ok. 980 passed; 0 failed; 20 ignored; 0 measured; 0 filtered out
2019-11-07T13:03:25.9551774Z 
2019-11-07T13:03:25.9671924Z  finished in 183.849
2019-11-07T13:03:25.9675232Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
2019-11-07T13:20:01.5646323Z Rustbook (x86_64-unknown-linux-gnu) - edition-guide
2019-11-07T13:20:01.9174952Z Building stage0 tool linkchecker (x86_64-unknown-linux-gnu)
2019-11-07T13:20:02.7190885Z    Compiling linkchecker v0.1.0 (/checkout/src/tools/linkchecker)
2019-11-07T13:20:04.1125863Z     Finished release [optimized] target(s) in 2.19s
2019-11-07T13:20:09.4845493Z rustc/command-line-arguments.html:164: id is not unique: `option-l-search-path`
2019-11-07T13:20:09.4861590Z rustc/print.html:212: id is not unique: `option-l-search-path`
2019-11-07T13:20:11.4970752Z thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:41:9
2019-11-07T13:20:11.5004616Z 
2019-11-07T13:20:11.5005010Z 
2019-11-07T13:20:11.5005786Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
2019-11-07T13:20:11.5006135Z expected success, got: exit code: 101
---
2019-11-07T13:20:11.5081076Z   local time: Thu Nov  7 13:20:11 UTC 2019
2019-11-07T13:20:11.5387344Z   network time: Thu, 07 Nov 2019 13:20:11 GMT
2019-11-07T13:20:11.5389639Z == end clock drift check ==
2019-11-07T13:20:15.5707256Z 
2019-11-07T13:20:15.5799403Z ##[error]Bash exited with code '1'.
2019-11-07T13:20:15.5834397Z ##[section]Starting: Checkout
2019-11-07T13:20:15.5836308Z ==============================================================================
2019-11-07T13:20:15.5836387Z Task         : Get sources
2019-11-07T13:20:15.5836425Z 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 @TimNN. (Feature Requests)

@Centril Centril closed this Nov 7, 2019
@Centril Centril deleted the rollup-4875y89 branch November 7, 2019 13:26
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.

None yet

7 participants