Skip to content

Commit 925f844

Browse files
borsbors
committed
Auto merge of rust-lang#116230 - matthiaskrgr:rollup-hi1ciwy, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#116191 (Add regression test for rust-lang#56098) - rust-lang#116214 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names) - rust-lang#116221 (core/slice: Fix inconsistency between docs for `rotate_left` and `rotate_right`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents dd91aba + ff958ae commit 925f844

24 files changed

+64
-1
lines changed

Diff for: ‎library/core/src/slice/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3410,7 +3410,7 @@ impl<T> [T] {
34103410
/// assert_eq!(a, ['e', 'f', 'a', 'b', 'c', 'd']);
34113411
/// ```
34123412
///
3413-
/// Rotate a subslice:
3413+
/// Rotating a subslice:
34143414
///
34153415
/// ```
34163416
/// let mut a = ['a', 'b', 'c', 'd', 'e', 'f'];

Diff for: ‎tests/rustdoc/issue-15169.rs renamed to ‎tests/rustdoc/anchor-id-trait-method-15169.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
// @has issue_15169/struct.Foo.html '//*[@id="method.eq"]' 'fn eq'
2+
3+
// https://github.com/rust-lang/rust/issues/15169
4+
#![crate_name="issue_15169"]
5+
26
#[derive(PartialEq)]
37
pub struct Foo;

Diff for: ‎tests/rustdoc/issue-20646.rs renamed to ‎tests/rustdoc/assoc-type-bindings-20646.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// aux-build:issue-20646.rs
22
// ignore-cross-compile
33

4+
// https://github.com/rust-lang/rust/issues/20646
5+
#![crate_name="issue_20646"]
46
#![feature(associated_types)]
57

68
extern crate issue_20646;

Diff for: ‎tests/rustdoc/issue-19190-2.rs renamed to ‎tests/rustdoc/deref-methods-19190-foreign-type.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// https://github.com/rust-lang/rust/issues/19190
2+
3+
#![crate_name="issue_19190_2"]
4+
15
use std::ops::Deref;
26

37
pub struct Bar;

Diff for: ‎tests/rustdoc/issue-19190-3.rs renamed to ‎tests/rustdoc/deref-methods-19190-inline.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// aux-build:issue-19190-3.rs
22
// ignore-cross-compile
33

4+
// https://github.com/rust-lang/rust/issues/19190
5+
#![crate_name="issue_19190_3"]
6+
47
extern crate issue_19190_3;
58

69
use std::ops::Deref;

Diff for: ‎tests/rustdoc/issue-19190.rs renamed to ‎tests/rustdoc/deref-methods-19190.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com/rust-lang/rust/issues/19190
2+
#![crate_name="issue_19190"]
3+
14
use std::ops::Deref;
25

36
pub struct Foo;

Diff for: ‎tests/rustdoc/issue-13698.rs renamed to ‎tests/rustdoc/doc-hidden-method-13698.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// aux-build:issue-13698.rs
22
// ignore-cross-compile
33

4+
// https://github.com/rust-lang/rust/issues/13698
5+
#![crate_name="issue_13698"]
6+
47
extern crate issue_13698;
58

69
pub struct Foo;

Diff for: ‎tests/rustdoc/issue-18199.rs renamed to ‎tests/rustdoc/doc-test-attr-18199.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// compile-flags:--test
2+
// https://github.com/rust-lang/rust/issues/18199
23

34
#![doc(test(attr(feature(staged_api))))]
45

Diff for: ‎tests/rustdoc/issue-15347.rs renamed to ‎tests/rustdoc/document-hidden-items-15347.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// compile-flags: -Z unstable-options --document-hidden-items
2+
// https://github.com/rust-lang/rust/issues/15347
3+
4+
#![crate_name="issue_15347"]
25

36
// @has issue_15347/fn.foo.html
47
#[doc(hidden)]

Diff for: ‎tests/rustdoc/issue-12834.rs renamed to ‎tests/rustdoc/highlight-invalid-rust-12834.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Tests that failing to syntax highlight a rust code-block doesn't cause
22
// rustdoc to fail, while still rendering the code-block (without highlighting).
3+
// https://github.com/rust-lang/rust/issues/12834
34

5+
#![crate_name="issue_12834"]
46
#![allow(rustdoc::invalid_rust_codeblocks)]
57

68
// @has issue_12834/fn.foo.html

Diff for: ‎tests/rustdoc/issue-19181.rs renamed to ‎tests/rustdoc/ice-type-error-19181.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// compile-flags:--test
2+
// https://github.com/rust-lang/rust/issues/19181
23

34
// rustdoc should not panic when target crate has compilation errors
45

Diff for: ‎tests/rustdoc/issue-20175.rs renamed to ‎tests/rustdoc/impl-ref-20175.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// https://github.com/rust-lang/rust/issues/20175
2+
3+
#![crate_name="issue_20175"]
4+
15
pub trait Foo {
26
fn foo(&self) {}
37
}

Diff for: ‎tests/rustdoc/issue-16265-1.rs renamed to ‎tests/rustdoc/infinite-redirection-16265-1.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com/rust-lang/rust/issues/16265
2+
#![crate_name="issue_16265_1"]
3+
14
pub struct Foo;
25

36
// @hasraw issue_16265_1/traits/index.html 'source'

Diff for: ‎tests/rustdoc/issue-16265-2.rs renamed to ‎tests/rustdoc/infinite-redirection-16265-2.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com/rust-lang/rust/issues/16265
2+
#![crate_name="issue_16265_2"]
3+
14
// @hasraw issue_16265_2/index.html 'source'
25

36
trait Y {}

Diff for: ‎tests/rustdoc/issue-20727-2.rs renamed to ‎tests/rustdoc/inline-assoc-type-20727-bindings.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// aux-build:issue-20727.rs
22
// ignore-cross-compile
33

4+
// https://github.com/rust-lang/rust/issues/20727
5+
#![crate_name="issue_20727_2"]
6+
47
extern crate issue_20727;
58

69
// @has issue_20727_2/trait.Add.html

Diff for: ‎tests/rustdoc/issue-20727-3.rs renamed to ‎tests/rustdoc/inline-assoc-type-20727-bounds-deref.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// aux-build:issue-20727.rs
22
// ignore-cross-compile
33

4+
// https://github.com/rust-lang/rust/issues/20727
5+
#![crate_name="issue_20727_3"]
6+
47
extern crate issue_20727;
58

69
pub trait Bar {}

Diff for: ‎tests/rustdoc/issue-20727-4.rs renamed to ‎tests/rustdoc/inline-assoc-type-20727-bounds-index.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// aux-build:issue-20727.rs
22
// ignore-cross-compile
33

4+
// https://github.com/rust-lang/rust/issues/20727
5+
#![crate_name="issue_20727_4"]
6+
47
extern crate issue_20727;
58

69
// @has issue_20727_4/trait.Index.html

Diff for: ‎tests/rustdoc/issue-20727.rs renamed to ‎tests/rustdoc/inline-assoc-type-20727-bounds.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// aux-build:issue-20727.rs
22
// ignore-cross-compile
33

4+
// https://github.com/rust-lang/rust/issues/20727
5+
#![crate_name="issue_20727"]
6+
47
extern crate issue_20727;
58

69
// @has issue_20727/trait.Deref.html

Diff for: ‎tests/rustdoc/issue-16019.rs renamed to ‎tests/rustdoc/macro-ice-16019.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// https://github.com/rust-lang/rust/issues/16019
2+
13
macro_rules! define_struct {
24
($rounds:expr) => (
35
struct Struct {

Diff for: ‎tests/rustdoc/issue-17476.rs renamed to ‎tests/rustdoc/method-link-foreign-trait-impl-17476.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// aux-build:issue-17476.rs
22
// ignore-cross-compile
3+
// https://github.com/rust-lang/rust/issues/17476
4+
5+
#![crate_name="issue_17476"]
36

47
extern crate issue_17476;
58

Diff for: ‎tests/rustdoc/issue-15318-3.rs renamed to ‎tests/rustdoc/primitive-raw-pointer-dox-15318-3.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// https://github.com/rust-lang/rust/issues/15318
2+
#![crate_name="issue_15318_3"]
13
#![feature(rustc_attrs)]
24

35
// @has issue_15318_3/primitive.pointer.html

Diff for: ‎tests/rustdoc/issue-15318.rs renamed to ‎tests/rustdoc/primitive-raw-pointer-link-15318.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// aux-build:issue-15318.rs
22
// ignore-cross-compile
3+
// https://github.com/rust-lang/rust/issues/15318
34

5+
#![crate_name="issue_15318"]
46
#![no_std]
57

68
extern crate issue_15318;

Diff for: ‎tests/rustdoc/issue-15318-2.rs renamed to ‎tests/rustdoc/primitive-raw-pointer-link-no-inlined-15318-2.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// aux-build:issue-15318.rs
22
// ignore-cross-compile
3+
// https://github.com/rust-lang/rust/issues/15318
4+
5+
#![crate_name="issue_15318_2"]
36
#![no_std]
47

58
extern crate issue_15318;

Diff for: ‎tests/ui/foreign/foreign-fn-linkname.rs

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// ignore-wasm32-bare no libc to test ffi with
33
// ignore-sgx no libc
44

5+
// Ensure no false positive on "unused extern crate" lint
6+
#![deny(unused_extern_crates)]
7+
58
#![feature(rustc_private)]
69

710
extern crate libc;

0 commit comments

Comments
 (0)