about summary refs log tree commit diff
path: root/src/ci/docker
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-12-14 12:46:08 +0000
committerbors <bors@rust-lang.org>2022-12-14 12:46:08 +0000
commitba64ba8b0dfd57f7d6d7399d0df7ded37d2af18d (patch)
tree37f9ba9fabdcb14e3983023722e8dfc16098eac6 /src/ci/docker
parent7bdda8f801818c1e9455725a964a3fa4f02c2bb8 (diff)
parentb6d140e2509092dc0a9877a4014d6dbe7956eabe (diff)
downloadrust-ba64ba8b0dfd57f7d6d7399d0df7ded37d2af18d.tar.gz
rust-ba64ba8b0dfd57f7d6d7399d0df7ded37d2af18d.zip
Auto merge of #105690 - matthiaskrgr:rollup-khtq97k, r=matthiaskrgr
Rollup of 6 pull requests

Successful merges:

 - #105642 (Minor grammar nit.)
 - #105658 (Remove ..X from RELEASES.md)
 - #105663 (Adjust log line in `fuchsia-test-runner.py`)
 - #105664 (rustdoc: apply `pre-wrap` CSS to code-wrapped links)
 - #105665 (rustdoc: simplify popover CSS)
 - #105676 (rustdoc: add CSS margin between `impl` docblock and its items)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker')
-rwxr-xr-xsrc/ci/docker/scripts/fuchsia-test-runner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/fuchsia-test-runner.py b/src/ci/docker/scripts/fuchsia-test-runner.py
index a2708d16947..3e86339859d 100755
--- a/src/ci/docker/scripts/fuchsia-test-runner.py
+++ b/src/ci/docker/scripts/fuchsia-test-runner.py
@@ -346,7 +346,7 @@ class TestEnvironment:
                 "-f",
                 self.ssh_keyfile_path(),
                 "-C",
-                "Generated by test_toolchain.py",
+                "Generated by fuchsia-test-runner.py",
             ],
             stdout=self.subprocess_output(),
             stderr=self.subprocess_output(),