Auto merge of #54660 - kennytm:rollup, r=kennytm
Rollup of 8 pull requests Successful merges: - #54564 (Add 1.29.1 release notes) - #54567 (Include path in stamp hash for debuginfo tests) - #54577 (rustdoc: give proc-macros their own pages) - #54590 (std: Don't let `rust_panic` get inlined) - #54598 (Remove useless lifetimes from `Pin` `impl`s.) - #54604 (Added help message for `self_in_typedefs` feature gate) - #54635 (Improve docs for std::io::Seek) - #54645 (Compute Android gdb version in compiletest)
This commit is contained in:
commit
9653f79033
24 changed files with 685 additions and 291 deletions
37
src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
Normal file
37
src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// no-prefer-dynamic
|
||||
|
||||
#![crate_type="proc-macro"]
|
||||
#![crate_name="some_macros"]
|
||||
|
||||
extern crate proc_macro;
|
||||
|
||||
use proc_macro::TokenStream;
|
||||
|
||||
/// a proc-macro that swallows its input and does nothing.
|
||||
#[proc_macro]
|
||||
pub fn some_proc_macro(_input: TokenStream) -> TokenStream {
|
||||
TokenStream::new()
|
||||
}
|
||||
|
||||
/// a proc-macro attribute that passes its item through verbatim.
|
||||
#[proc_macro_attribute]
|
||||
pub fn some_proc_attr(_attr: TokenStream, item: TokenStream) -> TokenStream {
|
||||
item
|
||||
}
|
||||
|
||||
/// a derive attribute that adds nothing to its input.
|
||||
#[proc_macro_derive(SomeDerive)]
|
||||
pub fn some_derive(_item: TokenStream) -> TokenStream {
|
||||
TokenStream::new()
|
||||
}
|
||||
|
||||
27
src/test/rustdoc/inline_cross/proc_macro.rs
Normal file
27
src/test/rustdoc/inline_cross/proc_macro.rs
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// ignore-stage1
|
||||
// aux-build:proc_macro.rs
|
||||
// build-aux-docs
|
||||
|
||||
// FIXME: if/when proc-macros start exporting their doc attributes across crates, we can turn on
|
||||
// cross-crate inlining for them
|
||||
|
||||
extern crate some_macros;
|
||||
|
||||
// @has proc_macro/index.html
|
||||
// @has - '//a/@href' '../some_macros/macro.some_proc_macro.html'
|
||||
// @has - '//a/@href' '../some_macros/attr.some_proc_attr.html'
|
||||
// @has - '//a/@href' '../some_macros/derive.SomeDerive.html'
|
||||
// @!has proc_macro/macro.some_proc_macro.html
|
||||
// @!has proc_macro/attr.some_proc_attr.html
|
||||
// @!has proc_macro/derive.SomeDerive.html
|
||||
pub use some_macros::{some_proc_macro, some_proc_attr, SomeDerive};
|
||||
62
src/test/rustdoc/proc-macro.rs
Normal file
62
src/test/rustdoc/proc-macro.rs
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// ignore-stage1
|
||||
|
||||
#![crate_type="proc-macro"]
|
||||
#![crate_name="some_macros"]
|
||||
|
||||
extern crate proc_macro;
|
||||
|
||||
use proc_macro::TokenStream;
|
||||
|
||||
// @has some_macros/index.html
|
||||
// @has - '//h2' 'Macros'
|
||||
// @has - '//h2' 'Attribute Macros'
|
||||
// @has - '//h2' 'Derive Macros'
|
||||
// @!has - '//h2' 'Functions'
|
||||
|
||||
// @has some_macros/all.html
|
||||
// @has - '//a[@href="macro.some_proc_macro.html"]' 'some_proc_macro'
|
||||
// @has - '//a[@href="attr.some_proc_attr.html"]' 'some_proc_attr'
|
||||
// @has - '//a[@href="derive.SomeDerive.html"]' 'SomeDerive'
|
||||
// @!has - '//a/@href' 'fn.some_proc_macro.html'
|
||||
// @!has - '//a/@href' 'fn.some_proc_attr.html'
|
||||
// @!has - '//a/@href' 'fn.some_derive.html'
|
||||
|
||||
// @has some_macros/index.html '//a/@href' 'macro.some_proc_macro.html'
|
||||
// @!has - '//a/@href' 'fn.some_proc_macro.html'
|
||||
// @has some_macros/macro.some_proc_macro.html
|
||||
// @!has some_macros/fn.some_proc_macro.html
|
||||
/// a proc-macro that swallows its input and does nothing.
|
||||
#[proc_macro]
|
||||
pub fn some_proc_macro(_input: TokenStream) -> TokenStream {
|
||||
TokenStream::new()
|
||||
}
|
||||
|
||||
// @has some_macros/index.html '//a/@href' 'attr.some_proc_attr.html'
|
||||
// @!has - '//a/@href' 'fn.some_proc_attr.html'
|
||||
// @has some_macros/attr.some_proc_attr.html
|
||||
// @!has some_macros/fn.some_proc_attr.html
|
||||
/// a proc-macro attribute that passes its item through verbatim.
|
||||
#[proc_macro_attribute]
|
||||
pub fn some_proc_attr(_attr: TokenStream, item: TokenStream) -> TokenStream {
|
||||
item
|
||||
}
|
||||
|
||||
// @has some_macros/index.html '//a/@href' 'derive.SomeDerive.html'
|
||||
// @!has - '//a/@href' 'fn.some_derive.html'
|
||||
// @has some_macros/derive.SomeDerive.html
|
||||
// @!has some_macros/fn.some_derive.html
|
||||
/// a derive attribute that adds nothing to its input.
|
||||
#[proc_macro_derive(SomeDerive)]
|
||||
pub fn some_derive(_item: TokenStream) -> TokenStream {
|
||||
TokenStream::new()
|
||||
}
|
||||
|
|
@ -3,6 +3,8 @@ error[E0411]: cannot find type `Self` in this scope
|
|||
|
|
||||
LL | Cons(T, &'a Self)
|
||||
| ^^^^ `Self` is only available in traits and impls
|
||||
|
|
||||
= help: add #![feature(self_in_typedefs)] to the crate attributes to enable
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@ LL | assert_eq!('x'.ipu_flatten(), 1);
|
|||
= warning: once this method is added to the standard library, the ambiguity may cause an error or change in behavior!
|
||||
= note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
|
||||
= help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_flatten(...)` to keep using the current method
|
||||
= note: add #![feature(ipu_flatten)] to the crate attributes to enable `inference_unstable_iterator::IpuIterator::ipu_flatten`
|
||||
= help: add #![feature(ipu_flatten)] to the crate attributes to enable `inference_unstable_iterator::IpuIterator::ipu_flatten`
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue