diff options
| author | Michael Howell <michael@notriddle.com> | 2024-10-26 17:46:22 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2024-10-26 17:56:38 -0700 |
| commit | 1819b4fa2339fcf416c8f3856f19190cab8c54ff (patch) | |
| tree | 834b41701135411878987068b3335be7cdf0d30d /tests/rustdoc-ui/doctest/doctest-output.rs | |
| parent | 9b18a122f769859dc00d7b2c73b03dc6a1152983 (diff) | |
| download | rust-1819b4fa2339fcf416c8f3856f19190cab8c54ff.tar.gz rust-1819b4fa2339fcf416c8f3856f19190cab8c54ff.zip | |
rustdoc: make doctest span tweak a 2024 edition change
Fixes #132203 This is a compatibility hack, because I think the new behavior is better. When an A `include_str!` B, and B `include_str!` C, the path to C should be resolved relative to B, not A. That's how `include!` itself works, so that's how `include_str!` with should work.
Diffstat (limited to 'tests/rustdoc-ui/doctest/doctest-output.rs')
| -rw-r--r-- | tests/rustdoc-ui/doctest/doctest-output.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/rustdoc-ui/doctest/doctest-output.rs b/tests/rustdoc-ui/doctest/doctest-output.rs index 72394a4bed3..0e5ccf0b090 100644 --- a/tests/rustdoc-ui/doctest/doctest-output.rs +++ b/tests/rustdoc-ui/doctest/doctest-output.rs @@ -1,6 +1,10 @@ -//@ edition:2018 -//@ aux-build:extern_macros.rs -//@ compile-flags:--test --test-args=--test-threads=1 +//@ revisions: edition2015 edition2024 +//@[edition2015]edition:2015 +//@[edition2015]aux-build:extern_macros.rs +//@[edition2015]compile-flags:--test --test-args=--test-threads=1 +//@[edition2024]edition:2015 +//@[edition2024]aux-build:extern_macros.rs +//@[edition2024]compile-flags:--test --test-args=--test-threads=1 -Z unstable-options //@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR" //@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME" //@ check-pass |