Skip to content

Commit f6f0ef4

Browse files
committed
reformatted rustdoc/cross-crate-info, fixing trailing newline issue
1 parent d8211de commit f6f0ef4

File tree

27 files changed

+2
-46
lines changed

27 files changed

+2
-46
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
//@ build-aux-docs
2-
3-
42
pub struct Quebec;
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
//@ aux-build:q.rs
22
//@ build-aux-docs
3-
4-
53
extern crate q;
64
pub trait Tango {}

tests/rustdoc/cross-crate-info/cargo-transitive-no-index/s.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ aux-build:t.rs
22
//@ build-aux-docs
3-
43
//@ has q/struct.Quebec.html
54
//@ has s/struct.Sierra.html
65
//@ has t/trait.Tango.html
@@ -12,7 +11,6 @@
1211

1312
// We document multiple crates into the same output directory, which
1413
// merges the cross-crate information. Everything is available.
15-
1614
extern crate t;
1715
pub struct Sierra;
1816
impl t::Tango for Sierra {}

tests/rustdoc/cross-crate-info/cargo-transitive/auxiliary/q.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
//@ doc-flags:--enable-index-page
33
//@ doc-flags:-Zunstable-options
44

5-
65
pub struct Quebec;

tests/rustdoc/cross-crate-info/cargo-transitive/auxiliary/t.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
//@ doc-flags:--enable-index-page
44
//@ doc-flags:-Zunstable-options
55

6-
76
extern crate q;
87
pub trait Tango {}

tests/rustdoc/cross-crate-info/cargo-transitive/s.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
// We document multiple crates into the same output directory, which
2121
// merges the cross-crate information. Everything is available.
22-
2322
extern crate t;
2423
pub struct Sierra;
2524
impl t::Tango for Sierra {}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
//@ build-aux-docs
2-
3-
42
pub trait Foxtrot {}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ aux-build:f.rs
22
//@ build-aux-docs
3-
43
//@ has e/enum.Echo.html
54
//@ has f/trait.Foxtrot.html
65
//@ hasraw e/enum.Echo.html 'Foxtrot'
@@ -10,7 +9,6 @@
109

1110
// document two crates in the same way that cargo does. do not provide
1211
// --enable-index-page
13-
1412
extern crate f;
1513
pub enum Echo {}
1614
impl f::Foxtrot for Echo {}

tests/rustdoc/cross-crate-info/cargo-two/auxiliary/f.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
//@ doc-flags:--enable-index-page
33
//@ doc-flags:-Zunstable-options
44

5-
65
pub trait Foxtrot {}

tests/rustdoc/cross-crate-info/cargo-two/e.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
// document two crates in the same way that cargo does, writing them both
1818
// into the same output directory
19-
2019
extern crate f;
2120
pub enum Echo {}
2221
impl f::Foxtrot for Echo {}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
//@ build-aux-docs
2-
3-
42
pub trait Foxtrot {}

tests/rustdoc/cross-crate-info/index-on-last/e.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//@ hasraw search-index.js 'Echo'
1616

1717
// only declare --enable-index-page to the last rustdoc invocation
18-
1918
extern crate f;
2019
pub enum Echo {}
2120
impl f::Foxtrot for Echo {}

tests/rustdoc/cross-crate-info/kitchen-sink/auxiliary/q.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
//@ doc-flags:--enable-index-page
33
//@ doc-flags:-Zunstable-options
44

5-
65
pub struct Quebec;

tests/rustdoc/cross-crate-info/kitchen-sink/auxiliary/r.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
//@ doc-flags:--enable-index-page
44
//@ doc-flags:-Zunstable-options
55

6-
76
extern crate s;
87
pub type Romeo = s::Sierra;

tests/rustdoc/cross-crate-info/kitchen-sink/auxiliary/s.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//@ doc-flags:--enable-index-page
44
//@ doc-flags:-Zunstable-options
55

6-
76
extern crate t;
87
pub struct Sierra;
98
impl t::Tango for Sierra {}

tests/rustdoc/cross-crate-info/kitchen-sink/auxiliary/t.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
//@ doc-flags:--enable-index-page
44
//@ doc-flags:-Zunstable-options
55

6-
76
extern crate q;
87
pub trait Tango {}

tests/rustdoc/cross-crate-info/kitchen-sink/i.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
//@ aux-build:q.rs
21
//@ aux-build:r.rs
3-
//@ aux-build:s.rs
2+
//@ aux-build:q.rs
43
//@ aux-build:t.rs
4+
//@ aux-build:s.rs
55
//@ build-aux-docs
66
//@ doc-flags:--enable-index-page
77
//@ doc-flags:-Zunstable-options
@@ -28,5 +28,3 @@
2828
//@ hasraw type.impl/s/struct.Sierra.js 'Romeo'
2929

3030
// document everything in the default mode
31-
32-

tests/rustdoc/cross-crate-info/single-crate-baseline/q.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@
99
//@ hasraw search-index.js 'Quebec'
1010

1111
// there's nothing cross-crate going on here
12-
1312
pub struct Quebec;
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//@ build-aux-docs
2-
32
//@ has q/struct.Quebec.html
43
//@ hasraw search-index.js 'Quebec'
54

65
// there's nothing cross-crate going on here
7-
86
pub struct Quebec;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
//@ build-aux-docs
2-
3-
42
pub struct Quebec;
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
//@ aux-build:q.rs
22
//@ build-aux-docs
3-
4-
53
extern crate q;
64
pub trait Tango {}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//@ aux-build:t.rs
22
//@ build-aux-docs
3-
4-
53
// simple test to see if we support building transitive crates
6-
74
extern crate t;
85
pub struct Sierra;
96
impl t::Tango for Sierra {}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
//@ build-aux-docs
2-
3-
42
pub trait Foxtrot {}
-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//@ aux-build:f.rs
22
//@ build-aux-docs
3-
4-
53
// simple test to assert that we can do a two-level aux-build
6-
74
extern crate f;
85
pub enum Echo {}
96
impl f::Foxtrot for Echo {}

tests/rustdoc/cross-crate-info/working-dir-examples/q.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
// where will --scrape-examples-output-path resolve the path to be?
99
// should be the root output directory
10-
1110
pub struct Quebec;
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
//@ build-aux-docs
22
//@ unique-doc-out-dir
3-
4-
53
pub trait Foxtrot {}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ aux-build:f.rs
22
//@ build-aux-docs
3-
43
//@ has e/enum.Echo.html
54
//@ !has f/trait.Foxtrot.html
65
//@ hasraw e/enum.Echo.html 'Foxtrot'
@@ -10,7 +9,6 @@
109

1110
// test the fact that our test runner will document this crate somewhere
1211
// else
13-
1412
extern crate f;
1513
pub enum Echo {}
1614
impl f::Foxtrot for Echo {}

0 commit comments

Comments
 (0)