diff options
| author | bors <bors@rust-lang.org> | 2025-07-30 18:16:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-30 18:16:17 +0000 |
| commit | 3048886e59c94470e726ecaaf2add7242510ac11 (patch) | |
| tree | 51d84934aaf1fdaa56b6aebe0ac35a7242812f7a /tests/rustdoc-ui/2024-doctests-crate-attribute.rs | |
| parent | e5e79f8bd428d0b8d26e8240d718b134ef297459 (diff) | |
| parent | 202d1f5bf4b6ab82fa5b84d044670ea3fdfbc158 (diff) | |
| download | rust-3048886e59c94470e726ecaaf2add7242510ac11.tar.gz rust-3048886e59c94470e726ecaaf2add7242510ac11.zip | |
Auto merge of #144692 - samueltardieu:rollup-0j1y08x, r=samueltardieu
Rollup of 4 pull requests Successful merges: - rust-lang/rust#143465 (Support multiple crate versions in --extern-html-root-url) - rust-lang/rust#144308 ([rustdoc] Display total time and compilation time of merged doctests) - rust-lang/rust#144655 (clean up codegen fn attrs) - rust-lang/rust#144675 (Reject running `compiletest` self-tests against stage 0 rustc unless explicitly allowed) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/rustdoc-ui/2024-doctests-crate-attribute.rs')
| -rw-r--r-- | tests/rustdoc-ui/2024-doctests-crate-attribute.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/rustdoc-ui/2024-doctests-crate-attribute.rs b/tests/rustdoc-ui/2024-doctests-crate-attribute.rs index c9887cbc63b..416d50cb070 100644 --- a/tests/rustdoc-ui/2024-doctests-crate-attribute.rs +++ b/tests/rustdoc-ui/2024-doctests-crate-attribute.rs @@ -4,6 +4,8 @@ //@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR" //@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME" //@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL" +//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME" +//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME" /// This doctest is used to ensure that if a crate attribute is present, /// it will not be part of the merged doctests. |