-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #100274 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] 1.64.0 branching Includes cherry picks of: * #100207 * rust-lang/rust-clippy#9302 * 49b1904 (explicit_auto_deref into nursery) * Avoid ICE in rustdoc when using Fn bounds #100205 r? `@Mark-Simulacrum`
- Loading branch information
Showing
14 changed files
with
117 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
nightly | ||
beta |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#![crate_name="first"] | ||
|
||
pub mod prelude { | ||
pub use crate::Bot; | ||
} | ||
|
||
pub struct Bot; | ||
|
||
impl Bot { | ||
pub fn new() -> Bot { | ||
Bot | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Regression test for #100143 | ||
|
||
use std::iter::Peekable; | ||
|
||
pub struct Span<F: Fn(&i32)> { | ||
inner: Peekable<ConditionalIterator<F>>, | ||
} | ||
|
||
pub struct ConditionalIterator<F> { | ||
f: F, | ||
} | ||
|
||
|
||
// @has 'fn_bound/struct.ConditionalIterator.html' '//h3[@class="code-header in-band"]' 'impl<F: Fn(&i32)> Iterator for ConditionalIterator<F>' | ||
impl<F: Fn(&i32)> Iterator for ConditionalIterator<F> { | ||
type Item = (); | ||
|
||
fn next(&mut self) -> Option<Self::Item> { | ||
todo!() | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
src/test/rustdoc/issue-100204-inline-impl-through-glob-import.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
// aux-build:issue-100204-aux.rs | ||
// build-aux-docs | ||
// ignore-cross-compile | ||
|
||
#![crate_name="second"] | ||
|
||
extern crate first; | ||
|
||
pub mod prelude {} | ||
|
||
// @has first/struct.Bot.html '//h4[@class="code-header"]' 'pub fn new() -> Bot' | ||
// @has second/struct.Bot.html '//h4[@class="code-header"]' 'pub fn new() -> Bot' | ||
#[doc(inline)] | ||
pub use first::*; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters