diff options
| author | bors <bors@rust-lang.org> | 2023-10-17 18:51:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-17 18:51:46 +0000 |
| commit | 94ba57cef4987cfc1aee063ff459bcd2ff2f3fab (patch) | |
| tree | f542a19ce007bac645c895d3420b9f99a534508b /tests/rustdoc-ui | |
| parent | bb74d1fa858852547bd8badaeeb0aed10e006c94 (diff) | |
| parent | 6e6cd68cd0e1e40a5cfbb33e8a7628295acf21a2 (diff) | |
| download | rust-94ba57cef4987cfc1aee063ff459bcd2ff2f3fab.tar.gz rust-94ba57cef4987cfc1aee063ff459bcd2ff2f3fab.zip | |
Auto merge of #116855 - matthiaskrgr:rollup-i2izdwb, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #111072 (Add new simpler and more explicit syntax for check-cfg) - #116717 (Special case iterator chain checks for suggestion) - #116719 (Add MonoItems and Instance to stable_mir) - #116787 (Implement an internal lint encouraging use of `Span::eq_ctxt`) - #116827 (Make `handle_options` public again.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/rustdoc-ui')
| -rw-r--r-- | tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs | 2 | ||||
| -rw-r--r-- | tests/rustdoc-ui/check-cfg/check-cfg.rs | 2 | ||||
| -rw-r--r-- | tests/rustdoc-ui/doctest/check-cfg-test.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs b/tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs index 5c500ce6ce0..806b6d1253d 100644 --- a/tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs +++ b/tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs @@ -1,2 +1,2 @@ // check-fail -// compile-flags: --check-cfg=names() +// compile-flags: --check-cfg=cfg() diff --git a/tests/rustdoc-ui/check-cfg/check-cfg.rs b/tests/rustdoc-ui/check-cfg/check-cfg.rs index fa8789ad3ed..96fa9e08dde 100644 --- a/tests/rustdoc-ui/check-cfg/check-cfg.rs +++ b/tests/rustdoc-ui/check-cfg/check-cfg.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: --check-cfg=names() -Z unstable-options +// compile-flags: --check-cfg=cfg() -Z unstable-options /// uniz is nor a builtin nor pass as arguments so is unexpected #[cfg(uniz)] diff --git a/tests/rustdoc-ui/doctest/check-cfg-test.rs b/tests/rustdoc-ui/doctest/check-cfg-test.rs index 49a801c3fb3..38cd59aa790 100644 --- a/tests/rustdoc-ui/doctest/check-cfg-test.rs +++ b/tests/rustdoc-ui/doctest/check-cfg-test.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: --test --nocapture --check-cfg=values(feature,"test") -Z unstable-options +// compile-flags: --test --nocapture --check-cfg=cfg(feature,values("test")) -Z unstable-options // normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR" // normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR" // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" |