diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-11 08:22:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-11 08:22:30 +0100 |
| commit | d8bb4d69db35368cf3ceff92ee59b100339bce3b (patch) | |
| tree | 3a5b9e442c50f010b343ae166178d644eca0e343 /src/test/rustdoc-ui | |
| parent | 2f8e2ff6ba7194424718e39f0482b6d350b5e170 (diff) | |
| parent | 03be3e21b1e259b24859b8f00f5280e56bd0b254 (diff) | |
Rollup merge of #91310 - hi-rustin:rustin-patch-rustdoc, r=jyn514
Add --out-dir flag for rustdoc part of https://github.com/rust-lang/rust/issues/91260 Add --out-dir flag for rustdoc and change the `-o` option to point to out-dir. I'm not quite sure if it should be stable, also I'm not sure if this parameter priority is appropriate? Or should I just refuse to pass both parameters at the same time? r? `@jyn514`
Diffstat (limited to 'src/test/rustdoc-ui')
| -rw-r--r-- | src/test/rustdoc-ui/use_both_out_dir_and_output_options.rs | 1 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/use_both_out_dir_and_output_options.stderr | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/test/rustdoc-ui/use_both_out_dir_and_output_options.rs b/src/test/rustdoc-ui/use_both_out_dir_and_output_options.rs new file mode 100644 index 00000000000..5037043f19a --- /dev/null +++ b/src/test/rustdoc-ui/use_both_out_dir_and_output_options.rs @@ -0,0 +1 @@ +// compile-flags: --output ./foo diff --git a/src/test/rustdoc-ui/use_both_out_dir_and_output_options.stderr b/src/test/rustdoc-ui/use_both_out_dir_and_output_options.stderr new file mode 100644 index 00000000000..96d2295ac3e --- /dev/null +++ b/src/test/rustdoc-ui/use_both_out_dir_and_output_options.stderr @@ -0,0 +1,2 @@ +error: cannot use both 'out-dir' and 'output' at once + |