Skip to content

Commit

Permalink
Auto merge of rust-lang#116230 - matthiaskrgr:rollup-hi1ciwy, r=matth…
Browse files Browse the repository at this point in the history
…iaskrgr

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
  • Loading branch information
bors committed Sep 28, 2023
2 parents dd91aba + ff958ae commit 925f844
Show file tree
Hide file tree
Showing 24 changed files with 64 additions and 1 deletion.
2 changes: 1 addition & 1 deletion library/core/src/slice/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3410,7 +3410,7 @@ impl<T> [T] {
/// assert_eq!(a, ['e', 'f', 'a', 'b', 'c', 'd']);
/// ```
///
/// Rotate a subslice:
/// Rotating a subslice:
///
/// ```
/// let mut a = ['a', 'b', 'c', 'd', 'e', 'f'];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// @has issue_15169/struct.Foo.html '//*[@id="method.eq"]' 'fn eq'

// https://github.com/rust-lang/rust/issues/15169
#![crate_name="issue_15169"]

#[derive(PartialEq)]
pub struct Foo;
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// aux-build:issue-20646.rs
// ignore-cross-compile

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

extern crate issue_20646;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// https://github.com/rust-lang/rust/issues/19190

#![crate_name="issue_19190_2"]

use std::ops::Deref;

pub struct Bar;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-build:issue-19190-3.rs
// ignore-cross-compile

// https://github.com/rust-lang/rust/issues/19190
#![crate_name="issue_19190_3"]

extern crate issue_19190_3;

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

use std::ops::Deref;

pub struct Foo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-build:issue-13698.rs
// ignore-cross-compile

// https://github.com/rust-lang/rust/issues/13698
#![crate_name="issue_13698"]

extern crate issue_13698;

pub struct Foo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// compile-flags:--test
// https://github.com/rust-lang/rust/issues/18199

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// compile-flags: -Z unstable-options --document-hidden-items
// https://github.com/rust-lang/rust/issues/15347

#![crate_name="issue_15347"]

// @has issue_15347/fn.foo.html
#[doc(hidden)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Tests that failing to syntax highlight a rust code-block doesn't cause
// rustdoc to fail, while still rendering the code-block (without highlighting).
// https://github.com/rust-lang/rust/issues/12834

#![crate_name="issue_12834"]
#![allow(rustdoc::invalid_rust_codeblocks)]

// @has issue_12834/fn.foo.html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// compile-flags:--test
// https://github.com/rust-lang/rust/issues/19181

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// https://github.com/rust-lang/rust/issues/20175

#![crate_name="issue_20175"]

pub trait Foo {
fn foo(&self) {}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// https://github.com/rust-lang/rust/issues/16265
#![crate_name="issue_16265_1"]

pub struct Foo;

// @hasraw issue_16265_1/traits/index.html 'source'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// https://github.com/rust-lang/rust/issues/16265
#![crate_name="issue_16265_2"]

// @hasraw issue_16265_2/index.html 'source'

trait Y {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-build:issue-20727.rs
// ignore-cross-compile

// https://github.com/rust-lang/rust/issues/20727
#![crate_name="issue_20727_2"]

extern crate issue_20727;

// @has issue_20727_2/trait.Add.html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-build:issue-20727.rs
// ignore-cross-compile

// https://github.com/rust-lang/rust/issues/20727
#![crate_name="issue_20727_3"]

extern crate issue_20727;

pub trait Bar {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-build:issue-20727.rs
// ignore-cross-compile

// https://github.com/rust-lang/rust/issues/20727
#![crate_name="issue_20727_4"]

extern crate issue_20727;

// @has issue_20727_4/trait.Index.html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-build:issue-20727.rs
// ignore-cross-compile

// https://github.com/rust-lang/rust/issues/20727
#![crate_name="issue_20727"]

extern crate issue_20727;

// @has issue_20727/trait.Deref.html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// https://github.com/rust-lang/rust/issues/16019

macro_rules! define_struct {
($rounds:expr) => (
struct Struct {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// aux-build:issue-17476.rs
// ignore-cross-compile
// https://github.com/rust-lang/rust/issues/17476

#![crate_name="issue_17476"]

extern crate issue_17476;

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

// @has issue_15318_3/primitive.pointer.html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// aux-build:issue-15318.rs
// ignore-cross-compile
// https://github.com/rust-lang/rust/issues/15318

#![crate_name="issue_15318"]
#![no_std]

extern crate issue_15318;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// aux-build:issue-15318.rs
// ignore-cross-compile
// https://github.com/rust-lang/rust/issues/15318

#![crate_name="issue_15318_2"]
#![no_std]

extern crate issue_15318;
Expand Down
3 changes: 3 additions & 0 deletions tests/ui/foreign/foreign-fn-linkname.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
// ignore-wasm32-bare no libc to test ffi with
// ignore-sgx no libc

// Ensure no false positive on "unused extern crate" lint
#![deny(unused_extern_crates)]

#![feature(rustc_private)]

extern crate libc;
Expand Down

0 comments on commit 925f844

Please sign in to comment.