diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2025-09-05 05:00:55 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2025-09-05 05:00:55 +0000 |
| commit | 7c5fdb072e3d07674ba88153a4cac4f792c20fdc (patch) | |
| tree | 78897a875065b81c78004b1cd0f83e78254fb11d /tests/rustdoc-gui/src/scrape_examples_ice | |
| parent | 9a1eb85394e3612213e829ed871eb281079a2364 (diff) | |
| parent | b6f8824315367f73e43efe08f6e5a88cc3f117ce (diff) | |
| download | rust-7c5fdb072e3d07674ba88153a4cac4f792c20fdc.tar.gz rust-7c5fdb072e3d07674ba88153a4cac4f792c20fdc.zip | |
Merge ref 'b3cfb8faf84c' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: b3cfb8faf84c5f3b7909479a9f9b6a3290d5f4d7 Filtered ref: 8995aa7743caf019203bc853f27af6006705ae30 Upstream diff: https://github.com/rust-lang/rust/compare/9385c64c95d971329e62917adc4349c8ccdbafe0...b3cfb8faf84c5f3b7909479a9f9b6a3290d5f4d7 This merge was created using https://github.com/rust-lang/josh-sync.
Diffstat (limited to 'tests/rustdoc-gui/src/scrape_examples_ice')
| -rw-r--r-- | tests/rustdoc-gui/src/scrape_examples_ice/empty.html | 1 | ||||
| -rw-r--r-- | tests/rustdoc-gui/src/scrape_examples_ice/extra.html | 1 | ||||
| -rw-r--r-- | tests/rustdoc-gui/src/scrape_examples_ice/src/lib.rs | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/rustdoc-gui/src/scrape_examples_ice/empty.html b/tests/rustdoc-gui/src/scrape_examples_ice/empty.html deleted file mode 100644 index 8b137891791..00000000000 --- a/tests/rustdoc-gui/src/scrape_examples_ice/empty.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tests/rustdoc-gui/src/scrape_examples_ice/extra.html b/tests/rustdoc-gui/src/scrape_examples_ice/extra.html new file mode 100644 index 00000000000..e7a420154a6 --- /dev/null +++ b/tests/rustdoc-gui/src/scrape_examples_ice/extra.html @@ -0,0 +1 @@ +<span id="outer-html"></span> diff --git a/tests/rustdoc-gui/src/scrape_examples_ice/src/lib.rs b/tests/rustdoc-gui/src/scrape_examples_ice/src/lib.rs index b854c7722c9..7d910c6de7d 100644 --- a/tests/rustdoc-gui/src/scrape_examples_ice/src/lib.rs +++ b/tests/rustdoc-gui/src/scrape_examples_ice/src/lib.rs @@ -1,5 +1,5 @@ //@ run-flags:-Zrustdoc-scrape-examples -//@ compile-flags: --html-after-content empty.html +//@ compile-flags: --html-after-content extra.html pub struct ObscurelyNamedType1; impl ObscurelyNamedType1 { |