Skip to content

Commit 6c49da4

Browse files
committedMar 30, 2019
Auto merge of #59550 - Centril:rollup, r=Centril
Rollup of 10 pull requests Successful merges: - #59376 (RFC 2008: Enum Variants) - #59453 (Recover from parse error in tuple syntax) - #59455 (Account for short-hand field syntax when suggesting borrow) - #59499 (Fix broken download link in the armhf-gnu image) - #59512 (implement `AsRawFd` for stdio locks) - #59525 (Whitelist some rustc attrs) - #59528 (Improve the dbg! macro docs ) - #59532 (In doc examples, don't ignore read/write results) - #59534 (rustdoc: collapse blanket impls in the same way as normal impls) - #59537 (Fix OnceWith docstring.) Failed merges: r? @ghost
2 parents 709b72e + 62a78c4 commit 6c49da4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+722
-281
lines changed
 

‎src/ci/docker/armhf-gnu/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ COPY scripts/qemu-bare-bones-addentropy.c /tmp/addentropy.c
7171
RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
7272

7373
# TODO: What is this?!
74-
RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb
74+
# Source of the file: https://github.com/vfdev-5/qemu-rpi2-vexpress/raw/master/vexpress-v2p-ca15-tc1.dtb
75+
RUN curl -O https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/vexpress-v2p-ca15-tc1.dtb
7576

7677
COPY scripts/sccache.sh /scripts/
7778
RUN sh /scripts/sccache.sh

‎src/doc/unstable-book/src/language-features/non-exhaustive.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ The tracking issue for this feature is: [#44109]
77
------------------------
88

99
The `non_exhaustive` gate allows you to use the `#[non_exhaustive]` attribute
10-
on structs and enums. When applied within a crate, users of the crate will need
11-
to use the `_` pattern when matching enums and use the `..` pattern when
12-
matching structs. Structs marked as `non_exhaustive` will not be able to be
13-
created normally outside of the defining crate. This is demonstrated below:
10+
on structs, enums and enum variants. When applied within a crate, users of the
11+
crate will need to use the `_` pattern when matching enums and use the `..`
12+
pattern when matching structs. Enum variants cannot be matched against.
13+
Structs and enum variants marked as `non_exhaustive` will not be able to
14+
be created normally outside of the defining crate. This is demonstrated
15+
below:
1416

1517
```rust,ignore (pseudo-Rust)
1618
use std::error::Error as StdError;
@@ -72,4 +74,3 @@ let config = Config { window_width: 640, window_height: 480 };
7274
// when marked non_exhaustive.
7375
let &Config { window_width, window_height, .. } = config;
7476
```
75-

0 commit comments

Comments
 (0)