Skip to content

Commit d841092

Browse files
authored
Rollup merge of #148639 - midsterx:test/rustdoc, r=GuillaumeGomez
test(rustdoc): move tests into jump-to-def Fixes #148548
2 parents 88ebf91 + ee8c913 commit d841092

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

tests/rustdoc/jump-to-def-assoc-items.rs renamed to tests/rustdoc/jump-to-def/assoc-items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#![crate_name = "foo"]
66

7-
//@ has 'src/foo/jump-to-def-assoc-items.rs.html'
7+
//@ has 'src/foo/assoc-items.rs.html'
88

99
pub trait Trait {
1010
type T;

tests/rustdoc/jump-to-def-ice-assoc-types.rs renamed to tests/rustdoc/jump-to-def/assoc-types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#![crate_name = "foo"]
77

8-
//@ has 'src/foo/jump-to-def-ice-assoc-types.rs.html'
8+
//@ has 'src/foo/assoc-types.rs.html'
99

1010
pub trait Trait {
1111
type Node;

tests/rustdoc/jump-to-def/jump-to-def-doc-links-calls.rs renamed to tests/rustdoc/jump-to-def/doc-links-calls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_name = "foo"]
44

5-
//@ has 'src/foo/jump-to-def-doc-links-calls.rs.html'
5+
//@ has 'src/foo/doc-links-calls.rs.html'
66

77
//@ has - '//a[@href="../../foo/struct.Bar.html"]' 'Bar'
88
pub struct Bar;

tests/rustdoc/jump-to-def/jump-to-def-doc-links.rs renamed to tests/rustdoc/jump-to-def/doc-links.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_name = "foo"]
44

5-
//@ has 'src/foo/jump-to-def-doc-links.rs.html'
5+
//@ has 'src/foo/doc-links.rs.html'
66

77
//@ has - '//a[@href="../../foo/struct.Bar.html"]' 'Bar'
88
//@ has - '//a[@href="../../foo/struct.Foo.html"]' 'Foo'

tests/rustdoc/jump-to-def/jump-to-def-macro.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/rustdoc/jump-to-def/macro.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//@ aux-build:symbols.rs
2+
//@ build-aux-docs
3+
//@ compile-flags: -Zunstable-options --generate-link-to-definition
4+
5+
#![crate_name = "foo"]
6+
7+
//@ has 'src/foo/macro.rs.html'
8+
9+
#[macro_use]
10+
extern crate symbols;
11+
12+
//@ has - '//a[@href="../../symbols/macro.symbols.html"]' 'symbols!'
13+
symbols! {
14+
A = 12
15+
}

tests/rustdoc/jump-to-def-ice.rs renamed to tests/rustdoc/jump-to-def/no-body-items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#![crate_name = "foo"]
77

8-
//@ has 'src/foo/jump-to-def-ice.rs.html'
8+
//@ has 'src/foo/no-body-items.rs.html'
99

1010
pub trait A {
1111
type T;

tests/rustdoc/jump-to-def/jump-to-non-local-method.rs renamed to tests/rustdoc/jump-to-def/non-local-method.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_name = "foo"]
44

5-
//@ has 'src/foo/jump-to-non-local-method.rs.html'
5+
//@ has 'src/foo/non-local-method.rs.html'
66

77
//@ has - '//a[@href="{{channel}}/core/sync/atomic/struct.AtomicIsize.html"]' 'std::sync::atomic::AtomicIsize'
88
use std::sync::atomic::AtomicIsize;

tests/rustdoc/jump-to-def/jump-to-def-pats.rs renamed to tests/rustdoc/jump-to-def/patterns.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#![crate_name = "foo"]
66

7-
//@ has 'src/foo/jump-to-def-pats.rs.html'
7+
//@ has 'src/foo/patterns.rs.html'
88

99
use std::fmt;
1010

0 commit comments

Comments
 (0)