Skip to content

Commit 9530fdc

Browse files
committed
Auto merge of #80724 - GuillaumeGomez:remove-useless-doc_alias-feature, r=jyn514
Remove useless doc_alias feature gate As `@jyn514` rightfully noted in #80686 , this feature is no more. Therefore, cleanup time! r? `@jyn514`
2 parents 41601ef + bfdc858 commit 9530fdc

8 files changed

+17
-23
lines changed

src/test/rustdoc-ui/doc-alias-crate-level.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(doc_alias)]
2-
31
#![doc(alias = "crate-level-not-working")] //~ ERROR
42

53
#[doc(alias = "shouldn't work!")] //~ ERROR

src/test/rustdoc-ui/doc-alias-crate-level.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: '\'' character isn't allowed in `#[doc(alias = "...")]`
2-
--> $DIR/doc-alias-crate-level.rs:5:15
2+
--> $DIR/doc-alias-crate-level.rs:3:15
33
|
44
LL | #[doc(alias = "shouldn't work!")]
55
| ^^^^^^^^^^^^^^^^^
66

77
error: `#![doc(alias = "...")]` isn't allowed as a crate level attribute
8-
--> $DIR/doc-alias-crate-level.rs:3:8
8+
--> $DIR/doc-alias-crate-level.rs:1:8
99
|
1010
LL | #![doc(alias = "crate-level-not-working")]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/check-doc-alias-attr-location.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![crate_type="lib"]
2-
#![feature(doc_alias)]
32

43
pub struct Bar;
54
pub trait Foo {

src/test/ui/check-doc-alias-attr-location.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: `#[doc(alias = "...")]` isn't allowed on extern block
2-
--> $DIR/check-doc-alias-attr-location.rs:10:7
2+
--> $DIR/check-doc-alias-attr-location.rs:9:7
33
|
44
LL | #[doc(alias = "foo")]
55
| ^^^^^^^^^^^^^
66

77
error: `#[doc(alias = "...")]` isn't allowed on implementation block
8-
--> $DIR/check-doc-alias-attr-location.rs:13:7
8+
--> $DIR/check-doc-alias-attr-location.rs:12:7
99
|
1010
LL | #[doc(alias = "bar")]
1111
| ^^^^^^^^^^^^^
1212

1313
error: `#[doc(alias = "...")]` isn't allowed on implementation block
14-
--> $DIR/check-doc-alias-attr-location.rs:19:7
14+
--> $DIR/check-doc-alias-attr-location.rs:18:7
1515
|
1616
LL | #[doc(alias = "foobar")]
1717
| ^^^^^^^^^^^^^^^^
1818

1919
error: `#[doc(alias = "...")]` isn't allowed on type alias in implementation block
20-
--> $DIR/check-doc-alias-attr-location.rs:21:11
20+
--> $DIR/check-doc-alias-attr-location.rs:20:11
2121
|
2222
LL | #[doc(alias = "assoc")]
2323
| ^^^^^^^^^^^^^^^

src/test/ui/check-doc-alias-attr.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![crate_type = "lib"]
2-
#![feature(doc_alias)]
32

43
#[doc(alias = "foo")] // ok!
54
pub struct Bar;

src/test/ui/check-doc-alias-attr.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
error: doc alias attribute expects a string: #[doc(alias = "a")]
2-
--> $DIR/check-doc-alias-attr.rs:7:7
2+
--> $DIR/check-doc-alias-attr.rs:6:7
33
|
44
LL | #[doc(alias)]
55
| ^^^^^
66

77
error: doc alias attribute expects a string: #[doc(alias = "a")]
8-
--> $DIR/check-doc-alias-attr.rs:8:7
8+
--> $DIR/check-doc-alias-attr.rs:7:7
99
|
1010
LL | #[doc(alias = 0)]
1111
| ^^^^^^^^^
1212

1313
error: doc alias attribute expects a string: #[doc(alias = "a")]
14-
--> $DIR/check-doc-alias-attr.rs:9:7
14+
--> $DIR/check-doc-alias-attr.rs:8:7
1515
|
1616
LL | #[doc(alias("bar"))]
1717
| ^^^^^^^^^^^^
1818

1919
error: '\"' character isn't allowed in `#[doc(alias = "...")]`
20-
--> $DIR/check-doc-alias-attr.rs:10:15
20+
--> $DIR/check-doc-alias-attr.rs:9:15
2121
|
2222
LL | #[doc(alias = "\"")]
2323
| ^^^^
2424

2525
error: '\n' character isn't allowed in `#[doc(alias = "...")]`
26-
--> $DIR/check-doc-alias-attr.rs:11:15
26+
--> $DIR/check-doc-alias-attr.rs:10:15
2727
|
2828
LL | #[doc(alias = "\n")]
2929
| ^^^^
3030

3131
error: '\n' character isn't allowed in `#[doc(alias = "...")]`
32-
--> $DIR/check-doc-alias-attr.rs:12:15
32+
--> $DIR/check-doc-alias-attr.rs:11:15
3333
|
3434
LL | #[doc(alias = "
3535
| _______________^
3636
LL | | ")]
3737
| |_^
3838

3939
error: '\t' character isn't allowed in `#[doc(alias = "...")]`
40-
--> $DIR/check-doc-alias-attr.rs:14:15
40+
--> $DIR/check-doc-alias-attr.rs:13:15
4141
|
4242
LL | #[doc(alias = "\t")]
4343
| ^^^^
4444

4545
error: `#[doc(alias = "...")]` cannot start or end with ' '
46-
--> $DIR/check-doc-alias-attr.rs:15:15
46+
--> $DIR/check-doc-alias-attr.rs:14:15
4747
|
4848
LL | #[doc(alias = " hello")]
4949
| ^^^^^^^^
5050

5151
error: `#[doc(alias = "...")]` cannot start or end with ' '
52-
--> $DIR/check-doc-alias-attr.rs:16:15
52+
--> $DIR/check-doc-alias-attr.rs:15:15
5353
|
5454
LL | #[doc(alias = "hello ")]
5555
| ^^^^^^^^

src/test/ui/doc-alias-crate-level.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// compile-flags: -Zdeduplicate-diagnostics=no
22

3-
#![feature(doc_alias)]
4-
53
#![crate_type = "lib"]
64

75
#![doc(alias = "not working!")] //~ ERROR

src/test/ui/doc-alias-crate-level.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: '\'' character isn't allowed in `#[doc(alias = "...")]`
2-
--> $DIR/doc-alias-crate-level.rs:9:15
2+
--> $DIR/doc-alias-crate-level.rs:7:15
33
|
44
LL | #[doc(alias = "shouldn't work!")]
55
| ^^^^^^^^^^^^^^^^^
66

77
error: `#![doc(alias = "...")]` isn't allowed as a crate level attribute
8-
--> $DIR/doc-alias-crate-level.rs:7:8
8+
--> $DIR/doc-alias-crate-level.rs:5:8
99
|
1010
LL | #![doc(alias = "not working!")]
1111
| ^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)