diff options
| author | bors <bors@rust-lang.org> | 2021-11-09 01:30:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-09 01:30:23 +0000 |
| commit | c57704f3eb4319cc93513c232e9c434a73af46d2 (patch) | |
| tree | ebb183987740f0b3ffc2b5dd1a1f26db0863be1e /src | |
| parent | 515472757d2991e280965d7c1d235cfbb6ceb006 (diff) | |
| parent | 27095246fb3883ce84aceb932c4fc5830ccb00e3 (diff) | |
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 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/rustdoc/include_str_cut.rs | 7 | ||||
| -rw-r--r-- | src/test/rustdoc/short-line.md | 2 | ||||
| m--------- | src/tools/rust-analyzer | 38 |
3 files changed, 25 insertions, 22 deletions
diff --git a/src/test/rustdoc/include_str_cut.rs b/src/test/rustdoc/include_str_cut.rs new file mode 100644 index 00000000000..cbc1ba8db75 --- /dev/null +++ b/src/test/rustdoc/include_str_cut.rs @@ -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() {} diff --git a/src/test/rustdoc/short-line.md b/src/test/rustdoc/short-line.md new file mode 100644 index 00000000000..eff713baac4 --- /dev/null +++ b/src/test/rustdoc/short-line.md @@ -0,0 +1,2 @@ +inc2 +x diff --git a/src/tools/rust-analyzer b/src/tools/rust-analyzer -Subproject 04f03a360ab8fef3d9c0ff84de2d39b8a196c71 +Subproject 2c0f433fd2e838ae181f87019b6f1fefe33c6f5 |