diff options
| author | bors <bors@rust-lang.org> | 2024-01-24 20:34:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-24 20:34:41 +0000 |
| commit | 7ffc697ce10f19447c0ce338428ae4b9bc0c041c (patch) | |
| tree | 2c2b3024247cea35c3c16a67dd661e78241ea221 /tests/coverage-run-rustdoc/doctest.coverage | |
| parent | cd6d8f2a04528f827ad3d399581c0f3502b15a72 (diff) | |
| parent | 8325f3dd63e99a2ea438430ee3f8cba07ba176c7 (diff) | |
| download | rust-7ffc697ce10f19447c0ce338428ae4b9bc0c041c.tar.gz rust-7ffc697ce10f19447c0ce338428ae4b9bc0c041c.zip | |
Auto merge of #120309 - fmease:rollup-kr7wqy6, r=fmease
Rollup of 9 pull requests Successful merges: - #114764 ([style edition 2024] Combine all delimited exprs as last argument) - #118326 (Add `NonZero*::count_ones`) - #119460 (coverage: Never emit improperly-ordered coverage regions) - #119616 (Add a new `wasm32-wasi-preview2` target) - #120185 (coverage: Don't instrument `#[automatically_derived]` functions) - #120265 (Remove no-system-llvm) - #120284 (privacy: Refactor top-level visiting in `TypePrivacyVisitor`) - #120285 (Remove extra # from url in suggestion) - #120299 (Add mw to review rotation and add some owner assignments) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/coverage-run-rustdoc/doctest.coverage')
| -rw-r--r-- | tests/coverage-run-rustdoc/doctest.coverage | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/coverage-run-rustdoc/doctest.coverage b/tests/coverage-run-rustdoc/doctest.coverage index 5797784f411..5125dc075ee 100644 --- a/tests/coverage-run-rustdoc/doctest.coverage +++ b/tests/coverage-run-rustdoc/doctest.coverage @@ -34,8 +34,7 @@ $DIR/doctest.rs: LL| |//! LL| |//! doctest returning a result: LL| 1|//! ``` - LL| 2|//! #[derive(Debug, PartialEq)] - ^1 + LL| 1|//! #[derive(Debug, PartialEq)] LL| 1|//! struct SomeError { LL| 1|//! msg: String, LL| 1|//! } @@ -63,7 +62,7 @@ $DIR/doctest.rs: LL| 1|//! println!("called some_func()"); LL| 1|//! } LL| |//! - LL| 0|//! #[derive(Debug)] + LL| |//! #[derive(Debug)] LL| |//! struct SomeError; LL| |//! LL| |//! extern crate doctest_crate; |