diff options
| author | bors <bors@rust-lang.org> | 2025-10-04 06:19:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-10-04 06:19:58 +0000 |
| commit | a0f398e89df9767c93c81cd58d44fdba071258a8 (patch) | |
| tree | 6c65806622032e569ced4c44d25b0441398351f4 /tests/rustdoc-ui/doctest/test-compile-fail1.stderr | |
| parent | 7950f244e7ef55b61a83d12f4662be643cd182d6 (diff) | |
| parent | 30442dc496138df6c6f56abe5f276392b78bdfbb (diff) | |
| download | rust-a0f398e89df9767c93c81cd58d44fdba071258a8.tar.gz rust-a0f398e89df9767c93c81cd58d44fdba071258a8.zip | |
Auto merge of #147308 - matthiaskrgr:rollup-ov04tbi, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang/rust#147245 (only replace the intended comma in pattern suggestions) - rust-lang/rust#147269 (Add regression test for 123953) - rust-lang/rust#147277 (Extract common logic for iterating over features) - rust-lang/rust#147292 (Respect `-Z` unstable options in `rustdoc --test`) - rust-lang/rust#147300 (Add xtensa arch to object file creation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/rustdoc-ui/doctest/test-compile-fail1.stderr')
| -rw-r--r-- | tests/rustdoc-ui/doctest/test-compile-fail1.stderr | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/rustdoc-ui/doctest/test-compile-fail1.stderr b/tests/rustdoc-ui/doctest/test-compile-fail1.stderr index 02f4d8d754f..aa5cc2e14d6 100644 --- a/tests/rustdoc-ui/doctest/test-compile-fail1.stderr +++ b/tests/rustdoc-ui/doctest/test-compile-fail1.stderr @@ -1,13 +1,13 @@ error[E0428]: the name `f` is defined multiple times - --> $DIR/test-compile-fail1.rs:8:1 - | -6 | pub fn f() {} - | ---------- previous definition of the value `f` here -7 | -8 | pub fn f() {} - | ^^^^^^^^^^ `f` redefined here - | - = note: `f` must be defined only once in the value namespace of this module + --> $DIR/test-compile-fail1.rs:8:1 + | +LL | pub fn f() {} + | ---------- previous definition of the value `f` here +LL | +LL | pub fn f() {} + | ^^^^^^^^^^ `f` redefined here + | + = note: `f` must be defined only once in the value namespace of this module error: aborting due to 1 previous error |