diff options
| author | bors <bors@rust-lang.org> | 2024-01-23 22:44:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-23 22:44:44 +0000 |
| commit | 0b7730105fb7e008002f6ba29f87a55699f67744 (patch) | |
| tree | 5dca2dde5b4baeebaa2cfe31e4ab8f3b96060671 /library/core/src/macros/mod.rs | |
| parent | 5d3d3479d774754856db2db3e439dfb88ef3c52f (diff) | |
| parent | 3f2f8eee0220d905121a2da4e24a02a90ef15b84 (diff) | |
| download | rust-0b7730105fb7e008002f6ba29f87a55699f67744.tar.gz rust-0b7730105fb7e008002f6ba29f87a55699f67744.zip | |
Auto merge of #120283 - fmease:rollup-rk0f6r5, r=fmease
Rollup of 9 pull requests Successful merges: - #112806 (Small code improvements in `collect_intra_doc_links.rs`) - #119766 (Split tait and impl trait in assoc items logic) - #120139 (Do not normalize closure signature when building `FnOnce` shim) - #120160 (Manually implement derived `NonZero` traits.) - #120171 (Fix assume and assert in jump threading) - #120183 (Add `#[coverage(off)]` to closures introduced by `#[test]` and `#[bench]`) - #120195 (add several resolution test cases) - #120259 (Split Diagnostics for Uncommon Codepoints: Add List to Display Characters Involved) - #120261 (Provide structured suggestion to use trait objects in some cases of `if` arm type divergence) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src/macros/mod.rs')
| -rw-r--r-- | library/core/src/macros/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs index a2437feeeb9..9bbaf62a5ca 100644 --- a/library/core/src/macros/mod.rs +++ b/library/core/src/macros/mod.rs @@ -1596,7 +1596,7 @@ pub(crate) mod builtin { /// /// [the reference]: ../../../reference/attributes/testing.html#the-test-attribute #[stable(feature = "rust1", since = "1.0.0")] - #[allow_internal_unstable(test, rustc_attrs)] + #[allow_internal_unstable(test, rustc_attrs, coverage_attribute)] #[rustc_builtin_macro] pub macro test($item:item) { /* compiler built-in */ @@ -1609,7 +1609,7 @@ pub(crate) mod builtin { soft, reason = "`bench` is a part of custom test frameworks which are unstable" )] - #[allow_internal_unstable(test, rustc_attrs)] + #[allow_internal_unstable(test, rustc_attrs, coverage_attribute)] #[rustc_builtin_macro] pub macro bench($item:item) { /* compiler built-in */ |