Skip to content

Commit 7446012

Browse files
committed
fix rustdoc tests
1 parent a3b5f1a commit 7446012

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

library/core/src/marker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ marker_impls! {
960960
#[lang = "destruct"]
961961
#[rustc_on_unimplemented(message = "can't drop `{Self}`", append_const_msg)]
962962
#[rustc_deny_explicit_impl(implement_via_object = false)]
963-
// FIXME(effects) #[const_trait]
963+
#[const_trait]
964964
pub trait Destruct {}
965965

966966
/// A marker for tuple types.

tests/rustdoc/rfc-2632-const-trait-impl.rs

+12-10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// To future blessers: make sure that `const_trait_impl` is
66
// stabilized when changing `@!has` to `@has`, and please do
77
// not remove this test.
8+
//
9+
// FIXME(effects) add `const_trait` to `Fn` so we use `~const`
810
#![feature(const_trait_impl)]
911
#![crate_name = "foo"]
1012

@@ -22,9 +24,9 @@ pub trait Tr<T> {
2224
// @has - '//section[@id="method.a"]/h4[@class="code-header"]/a[@class="trait"]' 'Fn'
2325
// @!has - '//section[@id="method.a"]/h4[@class="code-header"]/span[@class="where"]' '~const'
2426
// @has - '//section[@id="method.a"]/h4[@class="code-header"]/span[@class="where fmt-newline"]' ': Fn'
25-
fn a<A: ~const Fn() + ~const Destruct>()
27+
fn a<A: /* ~const */ Fn() + ~const Destruct>()
2628
where
27-
Option<A>: ~const Fn() + ~const Destruct,
29+
Option<A>: /* ~const */ Fn() + ~const Destruct,
2830
{
2931
}
3032
}
@@ -34,13 +36,13 @@ pub trait Tr<T> {
3436
// @has - '//section[@id="impl-Tr%3CT%3E-for-T"]/h3[@class="code-header"]/a[@class="trait"]' 'Fn'
3537
// @!has - '//section[@id="impl-Tr%3CT%3E-for-T"]/h3[@class="code-header"]/span[@class="where"]' '~const'
3638
// @has - '//section[@id="impl-Tr%3CT%3E-for-T"]/h3[@class="code-header"]/span[@class="where fmt-newline"]' ': Fn'
37-
impl<T: ~const Fn() + ~const Destruct> const Tr<T> for T
39+
impl<T: /* ~const */ Fn() + ~const Destruct> const Tr<T> for T
3840
where
39-
Option<T>: ~const Fn() + ~const Destruct,
41+
Option<T>: /* ~const */ Fn() + ~const Destruct,
4042
{
41-
fn a<A: ~const Fn() + ~const Destruct>()
43+
fn a<A: /* ~const */ Fn() + ~const Destruct>()
4244
where
43-
Option<A>: ~const Fn() + ~const Destruct,
45+
Option<A>: /* ~const */ Fn() + ~const Destruct,
4446
{
4547
}
4648
}
@@ -49,9 +51,9 @@ where
4951
// @has - '//pre[@class="rust item-decl"]/code/a[@class="trait"]' 'Fn'
5052
// @!has - '//pre[@class="rust item-decl"]/code/span[@class="where fmt-newline"]' '~const'
5153
// @has - '//pre[@class="rust item-decl"]/code/span[@class="where fmt-newline"]' ': Fn'
52-
pub const fn foo<F: ~const Fn() + ~const Destruct>()
54+
pub const fn foo<F: /* ~const */ Fn() + ~const Destruct>()
5355
where
54-
Option<F>: ~const Fn() + ~const Destruct,
56+
Option<F>: /* ~const */ Fn() + ~const Destruct,
5557
{
5658
F::a()
5759
}
@@ -61,9 +63,9 @@ impl<T> S<T> {
6163
// @has - '//section[@id="method.foo"]/h4[@class="code-header"]/a[@class="trait"]' 'Fn'
6264
// @!has - '//section[@id="method.foo"]/h4[@class="code-header"]/span[@class="where"]' '~const'
6365
// @has - '//section[@id="method.foo"]/h4[@class="code-header"]/span[@class="where fmt-newline"]' ': Fn'
64-
pub const fn foo<B, C: ~const Fn() + ~const Destruct>()
66+
pub const fn foo<B, C: /* ~const */ Fn() + ~const Destruct>()
6567
where
66-
B: ~const Fn() + ~const Destruct,
68+
B: /* ~const */ Fn() + ~const Destruct,
6769
{
6870
B::a()
6971
}

0 commit comments

Comments
 (0)