diff options
| author | bors <bors@rust-lang.org> | 2020-03-26 12:33:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-26 12:33:18 +0000 |
| commit | 2fbb07525e2f07a815e780a4268b11916248b5a9 (patch) | |
| tree | 45d6837d752b3628506e97f0ac317a258fa3619a /src/test/rustdoc | |
| parent | 3b1d7351186a073c72e4be3c7d7b7ab8f1f10c58 (diff) | |
| parent | 608715bbd10ec9a088d46f03db9afa689bfb3c90 (diff) | |
| download | rust-2fbb07525e2f07a815e780a4268b11916248b5a9.tar.gz rust-2fbb07525e2f07a815e780a4268b11916248b5a9.zip | |
Auto merge of #70427 - Centril:rollup-lrcad2c, r=Centril
Rollup of 5 pull requests Successful merges: - #68004 (permit negative impls for non-auto traits) - #70385 (Miri nits: comment and var name improvement) - #70411 (Fix for #62691: use the largest niche across all fields) - #70417 (parser: recover on `...` as a pattern, suggesting `..`) - #70424 (simplify match stmt) Failed merges: r? @ghost
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/empty-section.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/impl-parts-crosscrate.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/impl-parts.rs | 1 | ||||
| -rw-r--r-- | src/test/rustdoc/issue-55321.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/negative-impl-sidebar.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/negative-impl.rs | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/test/rustdoc/empty-section.rs b/src/test/rustdoc/empty-section.rs index d95f3a80365..665aa38b11e 100644 --- a/src/test/rustdoc/empty-section.rs +++ b/src/test/rustdoc/empty-section.rs @@ -1,6 +1,6 @@ #![crate_name = "foo"] -#![feature(optin_builtin_traits)] +#![feature(negative_impls)] pub struct Foo; diff --git a/src/test/rustdoc/impl-parts-crosscrate.rs b/src/test/rustdoc/impl-parts-crosscrate.rs index f9583d1a722..a68db9c70ad 100644 --- a/src/test/rustdoc/impl-parts-crosscrate.rs +++ b/src/test/rustdoc/impl-parts-crosscrate.rs @@ -1,7 +1,7 @@ // aux-build:rustdoc-impl-parts-crosscrate.rs // ignore-cross-compile -#![feature(optin_builtin_traits)] +#![feature(negative_impls)] extern crate rustdoc_impl_parts_crosscrate; diff --git a/src/test/rustdoc/impl-parts.rs b/src/test/rustdoc/impl-parts.rs index fbb4e725481..68baca9a04e 100644 --- a/src/test/rustdoc/impl-parts.rs +++ b/src/test/rustdoc/impl-parts.rs @@ -1,3 +1,4 @@ +#![feature(negative_impls)] #![feature(optin_builtin_traits)] pub auto trait AnOibit {} diff --git a/src/test/rustdoc/issue-55321.rs b/src/test/rustdoc/issue-55321.rs index 257cb32c65c..8c001db06c5 100644 --- a/src/test/rustdoc/issue-55321.rs +++ b/src/test/rustdoc/issue-55321.rs @@ -1,4 +1,4 @@ -#![feature(optin_builtin_traits)] +#![feature(negative_impls)] // @has issue_55321/struct.A.html // @has - '//*[@id="implementations-list"]/*[@class="impl"]//code' "impl !Send for A" diff --git a/src/test/rustdoc/negative-impl-sidebar.rs b/src/test/rustdoc/negative-impl-sidebar.rs index 838ca0402e4..cb46d1778d9 100644 --- a/src/test/rustdoc/negative-impl-sidebar.rs +++ b/src/test/rustdoc/negative-impl-sidebar.rs @@ -1,4 +1,4 @@ -#![feature(optin_builtin_traits)] +#![feature(negative_impls)] #![crate_name = "foo"] pub struct Foo; diff --git a/src/test/rustdoc/negative-impl.rs b/src/test/rustdoc/negative-impl.rs index 8ac87f4f0cb..d76aac6906c 100644 --- a/src/test/rustdoc/negative-impl.rs +++ b/src/test/rustdoc/negative-impl.rs @@ -1,4 +1,4 @@ -#![feature(optin_builtin_traits)] +#![feature(negative_impls)] // @matches negative_impl/struct.Alpha.html '//pre' "pub struct Alpha" pub struct Alpha; |