Auto merge of #90695 - GuillaumeGomez:rollup-kxvvw4o, r=GuillaumeGomez
Rollup of 4 pull requests Successful merges: - #90494 (ARMv6K Horizon OS panic change) - #90652 (use filter(|x| matches!(..)) instead of filter_map(|x| match x ... => Some(xy))) - #90657 (Fix bug with `#[doc]` string single-character last lines) - #90689 (⬆️ rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
c57704f3eb
8 changed files with 25 additions and 29 deletions
7
src/test/rustdoc/include_str_cut.rs
Normal file
7
src/test/rustdoc/include_str_cut.rs
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
#![crate_name = "foo"]
|
||||
#![no_std]
|
||||
|
||||
// @has 'foo/fn.foo.html'
|
||||
// @has - '//*[@class="docblock"]' 'inc2 x'
|
||||
#[doc = include_str!("short-line.md")]
|
||||
pub fn foo() {}
|
||||
2
src/test/rustdoc/short-line.md
Normal file
2
src/test/rustdoc/short-line.md
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
inc2
|
||||
x
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 04f03a360ab8fef3d9c0ff84de2d39b8a196c717
|
||||
Subproject commit 2c0f433fd2e838ae181f87019b6f1fefe33c6f54
|
||||
Loading…
Add table
Add a link
Reference in a new issue