about summary refs log tree commit diff
path: root/library/std/src/sys/unix/stack_overflow.rs
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2021-04-08 01:01:42 +0200
committerGitHub <noreply@github.com>2021-04-08 01:01:42 +0200
commitcbe3eba99a74144f4f6474c3c6dca5edc2da3f1f (patch)
tree95d63b7b2af0f7354a721665592763dea96687dd /library/std/src/sys/unix/stack_overflow.rs
parentef2ef926a53baaa9d7a1b73b516d399af7e9aedb (diff)
parentffd7094f1d0f0a619b6d40d7f4705cbb04005e20 (diff)
downloadrust-cbe3eba99a74144f4f6474c3c6dca5edc2da3f1f.tar.gz
rust-cbe3eba99a74144f4f6474c3c6dca5edc2da3f1f.zip
Rollup merge of #82497 - jyn514:json, r=CraftSpider
Fix handling of `--output-format json` flag

- Don't treat it as deprecated on stable and beta channels. Before, it
  would give confusing and incorrect output:

  ```
  warning: the 'output-format' flag is considered deprecated
    |
    = warning: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information

  error: json output format isn't supported for doc generation
  ```
  Both of those are wrong: output-format isn't deprecated, and json
  output is supported.

- Require -Z unstable-options for `--output-format json`

  Previously, it was allowed by default on nightly, which made it hard
  to realize the flag wouldn't be accepted on beta or stable.

To get the test working I had to remove `-Z unstable-options`, which x.py passed to compiletest unconditionally. It was first added in https://github.com/rust-lang/rust/commit/8c2ec689c159e7f021d5913efb991aff875be967 so `-Z miri` would be allowed. -Z miri is no longer passed unconditionally, so hopefully removing it won't break anything.

r? ```@aDotInTheVoid``` cc ```@HeroicKatora``` ```@CraftSpider```

Thanks to ```@memoryruins``` for pointing it out on Discord!

cc ```@Mark-Simulacrum``` for the change to compiletest.
Diffstat (limited to 'library/std/src/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions