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 4 pull requests #66184

Closed
wants to merge 18 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 18 commits October 16, 2019 07:27
Add ERROR

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
…, 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
…nieu

Add `MaybeUninit` methods `uninit_array`, `slice_get_ref`, `slice_get_mut`

Eventually these will hopefully become the idiomatic way to work with partially-initialized stack buffers.

All methods are unstable. Note that `uninit_array` takes a type-level `const usize` parameter, so it is blocked (at least in its current form) on const generics.

Example:

```rust
use std::mem::MaybeUninit;

let input = b"Foo";
let f = u8::to_ascii_uppercase;

let mut buffer: [MaybeUninit<u8>; 32] = MaybeUninit::uninit_array();
let vec;
let output = if let Some(buffer) = buffer.get_mut(..input.len()) {
    buffer.iter_mut().zip(input).for_each(|(a, b)| { a.write(f(b)); });
    unsafe { MaybeUninit::slice_get_ref(buffer) }
} else {
    vec = input.iter().map(f).collect::<Vec<u8>>();
    &vec
};

assert_eq!(output, b"FOO");
```
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 Centril closed this Nov 7, 2019
@Centril Centril deleted the rollup-i35wqe5 branch November 7, 2019 11:35
@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:34:12.2599921Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-07T11:34:12.2793146Z ##[command]git config gc.auto 0
2019-11-07T11:34:12.2862276Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-07T11:34:12.2918210Z ##[command]git config --get-all http.proxy
2019-11-07T11:34:12.3059603Z ##[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/66184/merge:refs/remotes/pull/66184/merge
---
2019-11-07T12:34:36.2259629Z .................................................................................................... 1600/9290
2019-11-07T12:34:41.9198648Z .................................................................................................... 1700/9290
2019-11-07T12:34:53.9358007Z ................................................................i................................... 1800/9290
2019-11-07T12:35:01.4981787Z .................................................................................................... 1900/9290
2019-11-07T12:35:16.1215574Z ................................................iiiii............................................... 2000/9290
2019-11-07T12:35:26.5860655Z .................................................................................................... 2200/9290
2019-11-07T12:35:29.0293957Z .................................................................................................... 2300/9290
2019-11-07T12:35:32.6063861Z .................................................................................................... 2400/9290
2019-11-07T12:35:55.1371301Z .................................................................................................... 2500/9290
---
2019-11-07T12:38:43.0729595Z .............................................i...............i...................................... 4800/9290
2019-11-07T12:38:51.8524912Z .................................................................................................... 4900/9290
2019-11-07T12:38:59.9655953Z .................................................................................................... 5000/9290
2019-11-07T12:39:06.5879036Z .................................................................................................... 5100/9290
2019-11-07T12:39:16.5049088Z ...............................................ii.ii...........i.................................... 5200/9290
2019-11-07T12:39:25.9253757Z .................................................................................................... 5400/9290
2019-11-07T12:39:36.3270157Z .................................................................................................... 5500/9290
2019-11-07T12:39:44.1024962Z .............................i...................................................................... 5600/9290
2019-11-07T12:39:50.4713046Z .................................................................................................... 5700/9290
2019-11-07T12:39:50.4713046Z .................................................................................................... 5700/9290
2019-11-07T12:40:02.5010110Z .................................................................................................... 5800/9290
2019-11-07T12:40:14.2699529Z ..............ii...i..ii...........i................................................................ 5900/9290
2019-11-07T12:40:35.1432547Z .................................................................................................... 6100/9290
2019-11-07T12:40:42.3899134Z .................................................................................................... 6200/9290
2019-11-07T12:40:42.3899134Z .................................................................................................... 6200/9290
2019-11-07T12:40:55.8592540Z .................................i..ii.............................................................. 6300/9290
2019-11-07T12:41:16.4122548Z .................................................................................................... 6500/9290
2019-11-07T12:41:18.5771553Z .i.................................................................................................. 6600/9290
2019-11-07T12:41:20.8075064Z .....................................................................................i.............. 6700/9290
2019-11-07T12:41:23.5168153Z .................................................................................................... 6800/9290
---
2019-11-07T12:46:46.5053587Z  finished in 5.703
2019-11-07T12:46:46.5242055Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:46:46.7322552Z 
2019-11-07T12:46:46.7323524Z running 156 tests
2019-11-07T12:46:49.7670337Z iiii....iii......iii..iiii...i.............................i..i..................i....i...........ii 100/156
2019-11-07T12:46:51.7158765Z .i.i..iiii..............i.........iii.i.........ii......
2019-11-07T12:46:51.7159583Z 
2019-11-07T12:46:51.7161981Z  finished in 5.192
2019-11-07T12:46:51.7359197Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:46:51.9105898Z 
---
2019-11-07T12:46:53.9327936Z  finished in 2.196
2019-11-07T12:46:53.9531092Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:46:54.1269750Z 
2019-11-07T12:46:54.1270009Z running 9 tests
2019-11-07T12:46:54.1270788Z iiiiiiiii
2019-11-07T12:46:54.1271179Z 
2019-11-07T12:46:54.1274434Z  finished in 0.174
2019-11-07T12:46:54.1470017Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:46:54.3508354Z 
---
2019-11-07T12:47:14.5098227Z  finished in 20.363
2019-11-07T12:47:14.5334266Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:47:14.7329687Z 
2019-11-07T12:47:14.7330103Z running 123 tests
2019-11-07T12:47:38.9252407Z .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:47:43.6754343Z i.i.i......iii.i.....ii
2019-11-07T12:47:43.6754785Z 
2019-11-07T12:47:43.6760132Z  finished in 29.142
2019-11-07T12:47:43.6766471Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-07T12:47:43.6766839Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-11-07T12:59:43.4174091Z 
2019-11-07T12:59:43.4175338Z    Doc-tests core
2019-11-07T12:59:48.3268253Z 
2019-11-07T12:59:48.3269118Z running 2418 tests
2019-11-07T12:59:58.6064355Z ......iiiii......................................................................................... 100/2418
2019-11-07T13:00:08.7880529Z ................................................................................ii.................. 200/2418
2019-11-07T13:00:32.9023926Z ..i................................................................................................. 400/2418
2019-11-07T13:00:32.9023926Z ..i................................................................................................. 400/2418
2019-11-07T13:00:43.0309281Z ..................................................i..i.................iiii......................... 500/2418
2019-11-07T13:01:01.9869217Z .................................................................................................... 700/2418
2019-11-07T13:01:11.9045905Z .................................................................................................... 800/2418
2019-11-07T13:01:22.0070259Z .................................................................................................... 900/2418
2019-11-07T13:01:31.9203193Z .................................................................................................... 1000/2418
---
2019-11-07T13:05:24.1227272Z .................................................................................................... 500/763
2019-11-07T13:05:24.1487880Z ....................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-11-07T13:05:24.1507953Z ....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: "SendError(..)"', src/libcore/result.rs:1165:5
2019-11-07T13:05:24.1512585Z thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-11-07T13:05:24.1540749Z .......thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-11-07T13:05:24.3451339Z ..........................................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-11-07T13:05:24.3489609Z .....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', .src/libcore/result.rs.:1165.:5.
2019-11-07T13:05:24.3494266Z ..thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-11-07T13:05:26.4032587Z ........................thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/mutex.rs:629:13
2019-11-07T13:05:26.4036604Z thread '<unnamed>' panicked at 'test panic in inner thread to poison mutex', src/libstd/sync/mutex.rs:584:13
2019-11-07T13:05:26.4043408Z ...thread '<unnamed>' panicked at 'test panic in inner thread to poison mutex', src/libstd/sync/mutex.rs:561:13
2019-11-07T13:05:26.4053187Z .thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/mutex.rs:689:13
---
2019-11-07T13:05:35.6793154Z 
2019-11-07T13:05:35.6793508Z running 1000 tests
2019-11-07T13:05:56.4615376Z i................................................................................................... 100/1000
2019-11-07T13:06:07.6013581Z .................................................................................................... 200/1000
2019-11-07T13:06:15.6099663Z ...................iii......i......i...i......i..................................................... 300/1000
2019-11-07T13:06:20.9183806Z .................................................................................................... 400/1000
2019-11-07T13:06:28.4951708Z ...........................................i..i.................................ii.................. 500/1000
2019-11-07T13:06:42.5444256Z .................................................................................................... 700/1000
2019-11-07T13:06:42.5444256Z .................................................................................................... 700/1000
2019-11-07T13:06:50.1943052Z ..........................iiii...................................................................... 800/1000
2019-11-07T13:07:05.7460352Z .................................................................................................... 900/1000
2019-11-07T13:07:13.3857659Z ................................................iiii................................................ 1000/1000
2019-11-07T13:07:13.3861741Z test result: ok. 980 passed; 0 failed; 20 ignored; 0 measured; 0 filtered out
2019-11-07T13:07:13.3862022Z 
2019-11-07T13:07:13.3906293Z  finished in 191.755
2019-11-07T13:07:13.3920958Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
2019-11-07T13:24:36.4618578Z Rustbook (x86_64-unknown-linux-gnu) - edition-guide
2019-11-07T13:24:36.8470890Z Building stage0 tool linkchecker (x86_64-unknown-linux-gnu)
2019-11-07T13:24:37.0180312Z    Compiling linkchecker v0.1.0 (/checkout/src/tools/linkchecker)
2019-11-07T13:24:39.2260542Z     Finished release [optimized] target(s) in 2.37s
2019-11-07T13:24:44.9562317Z rustc/command-line-arguments.html:164: id is not unique: `option-l-search-path`
2019-11-07T13:24:44.9579116Z rustc/print.html:212: id is not unique: `option-l-search-path`
2019-11-07T13:24:47.0056633Z thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:41:9
2019-11-07T13:24:47.0086483Z 
2019-11-07T13:24:47.0086835Z 
2019-11-07T13:24:47.0087591Z 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:24:47.0087866Z expected success, got: exit code: 101
---
2019-11-07T13:24:47.0164311Z   local time: Thu Nov  7 13:24:47 UTC 2019
2019-11-07T13:24:47.0480647Z   network time: Thu, 07 Nov 2019 13:24:47 GMT
2019-11-07T13:24:47.0482986Z == end clock drift check ==
2019-11-07T13:24:51.3083656Z 
2019-11-07T13:24:51.3179717Z ##[error]Bash exited with code '1'.
2019-11-07T13:24:51.3218105Z ##[section]Starting: Checkout
2019-11-07T13:24:51.3219845Z ==============================================================================
2019-11-07T13:24:51.3219901Z Task         : Get sources
2019-11-07T13:24:51.3219949Z 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)

@JohnTitor JohnTitor added the rollup A PR which is a rollup label Dec 23, 2019
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants