From ddfb581fb9e04595bc7cdb9d66792fdfdbec67ed Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sat, 28 Nov 2020 20:25:41 -0500 Subject: Move `src/test/rustdoc` intra-doc link tests into a subdirectory They were starting to get unwieldy. --- .../auxiliary/intra-link-cross-crate-crate.rs | 5 ---- .../rustdoc/auxiliary/intra-link-extern-crate.rs | 3 -- .../auxiliary/intra-link-proc-macro-macro.rs | 35 ---------------------- src/test/rustdoc/auxiliary/intra-link-pub-use.rs | 4 --- .../intra-link-reexport-additional-docs.rs | 6 ---- .../auxiliary/intra-links-external-traits.rs | 6 ---- src/test/rustdoc/auxiliary/my-core.rs | 19 ------------ .../rustdoc/auxiliary/through-proc-macro-aux.rs | 20 ------------- 8 files changed, 98 deletions(-) delete mode 100644 src/test/rustdoc/auxiliary/intra-link-cross-crate-crate.rs delete mode 100644 src/test/rustdoc/auxiliary/intra-link-extern-crate.rs delete mode 100644 src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs delete mode 100644 src/test/rustdoc/auxiliary/intra-link-pub-use.rs delete mode 100644 src/test/rustdoc/auxiliary/intra-link-reexport-additional-docs.rs delete mode 100644 src/test/rustdoc/auxiliary/intra-links-external-traits.rs delete mode 100644 src/test/rustdoc/auxiliary/my-core.rs delete mode 100644 src/test/rustdoc/auxiliary/through-proc-macro-aux.rs (limited to 'src/test/rustdoc/auxiliary') diff --git a/src/test/rustdoc/auxiliary/intra-link-cross-crate-crate.rs b/src/test/rustdoc/auxiliary/intra-link-cross-crate-crate.rs deleted file mode 100644 index a37848e23d9..00000000000 --- a/src/test/rustdoc/auxiliary/intra-link-cross-crate-crate.rs +++ /dev/null @@ -1,5 +0,0 @@ -#![crate_name = "inner"] - -/// Links to [crate::g] -pub fn f() {} -pub fn g() {} diff --git a/src/test/rustdoc/auxiliary/intra-link-extern-crate.rs b/src/test/rustdoc/auxiliary/intra-link-extern-crate.rs deleted file mode 100644 index db3bb38ada0..00000000000 --- a/src/test/rustdoc/auxiliary/intra-link-extern-crate.rs +++ /dev/null @@ -1,3 +0,0 @@ -#![crate_name="inner"] - -//! ooh, i'm a rebel just for [kicks] diff --git a/src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs b/src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs deleted file mode 100644 index 04a431d9902..00000000000 --- a/src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs +++ /dev/null @@ -1,35 +0,0 @@ -// force-host -// no-prefer-dynamic -// compile-flags: --crate-type proc-macro - -#![crate_type="proc-macro"] -#![crate_name="intra_link_proc_macro_macro"] - -extern crate proc_macro; - -use proc_macro::TokenStream; - -#[proc_macro_derive(DeriveA)] -pub fn a_derive(input: TokenStream) -> TokenStream { - input -} - -#[proc_macro_derive(DeriveB)] -pub fn b_derive(input: TokenStream) -> TokenStream { - input -} - -#[proc_macro_derive(DeriveTrait)] -pub fn trait_derive(input: TokenStream) -> TokenStream { - input -} - -#[proc_macro_attribute] -pub fn attr_a(input: TokenStream, _args: TokenStream) -> TokenStream { - input -} - -#[proc_macro_attribute] -pub fn attr_b(input: TokenStream, _args: TokenStream) -> TokenStream { - input -} diff --git a/src/test/rustdoc/auxiliary/intra-link-pub-use.rs b/src/test/rustdoc/auxiliary/intra-link-pub-use.rs deleted file mode 100644 index a4db2ffc445..00000000000 --- a/src/test/rustdoc/auxiliary/intra-link-pub-use.rs +++ /dev/null @@ -1,4 +0,0 @@ -#![crate_name = "inner"] - -/// Documentation, including a link to [std::ptr] -pub fn f() {} diff --git a/src/test/rustdoc/auxiliary/intra-link-reexport-additional-docs.rs b/src/test/rustdoc/auxiliary/intra-link-reexport-additional-docs.rs deleted file mode 100644 index fc51995a94e..00000000000 --- a/src/test/rustdoc/auxiliary/intra-link-reexport-additional-docs.rs +++ /dev/null @@ -1,6 +0,0 @@ -#![crate_name = "inner"] - -/// Links to [f()] -pub struct Inner; - -pub fn f() {} diff --git a/src/test/rustdoc/auxiliary/intra-links-external-traits.rs b/src/test/rustdoc/auxiliary/intra-links-external-traits.rs deleted file mode 100644 index 6142dcda986..00000000000 --- a/src/test/rustdoc/auxiliary/intra-links-external-traits.rs +++ /dev/null @@ -1,6 +0,0 @@ -pub trait ThisTrait { - fn asdf(&self); - - /// let's link to [`asdf`](ThisTrait::asdf) - fn qwop(&self); -} diff --git a/src/test/rustdoc/auxiliary/my-core.rs b/src/test/rustdoc/auxiliary/my-core.rs deleted file mode 100644 index 54e986be9ec..00000000000 --- a/src/test/rustdoc/auxiliary/my-core.rs +++ /dev/null @@ -1,19 +0,0 @@ -#![feature(no_core, lang_items)] -#![no_core] -#![crate_type="rlib"] - -#[lang = "char"] -impl char { - pub fn len_utf8(self) -> usize { - 42 - } -} - -#[lang = "sized"] -pub trait Sized {} - -#[lang = "clone"] -pub trait Clone: Sized {} - -#[lang = "copy"] -pub trait Copy: Clone {} diff --git a/src/test/rustdoc/auxiliary/through-proc-macro-aux.rs b/src/test/rustdoc/auxiliary/through-proc-macro-aux.rs deleted file mode 100644 index 5c4a01ee3a7..00000000000 --- a/src/test/rustdoc/auxiliary/through-proc-macro-aux.rs +++ /dev/null @@ -1,20 +0,0 @@ -// force-host -// no-prefer-dynamic -#![crate_type = "proc-macro"] -#![crate_name="some_macros"] - -extern crate proc_macro; -use proc_macro::TokenStream; - -#[proc_macro_attribute] -pub fn first(_attr: TokenStream, item: TokenStream) -> TokenStream { - item // This doesn't erase the spans. -} - -#[proc_macro_attribute] -pub fn second(_attr: TokenStream, item: TokenStream) -> TokenStream { - // Make a new `TokenStream` to erase the spans: - let mut out: TokenStream = TokenStream::new(); - out.extend(item); - out -} -- cgit 1.4.1-3-g733a5