Skip to content

Commit ff24ac4

Browse files
committed
Try fixing some tests
1 parent 1164c94 commit ff24ac4

27 files changed

+52
-255
lines changed

src/test/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// check-pass
22

33
#![feature(const_trait_impl)]
4-
#![feature(const_trait_bound_opt_out)]
54
#![feature(const_fn_trait_bound)]
6-
#![allow(incomplete_features)]
75

86
struct S;
97

@@ -16,9 +14,9 @@ impl const PartialEq for S {
1614
}
1715
}
1816

19-
// This duplicate bound should not result in ambiguities. It should be equivalent to a single const
17+
// This duplicate bound should not result in ambiguities. It should be equivalent to a single ~const
2018
// bound.
21-
const fn equals_self<T: PartialEq + ?const PartialEq>(t: &T) -> bool {
19+
const fn equals_self<T: PartialEq + ~const PartialEq>(t: &T) -> bool {
2220
*t == *t
2321
}
2422

src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#![feature(const_fn_trait_bound)]
22
#![feature(const_trait_impl)]
3-
#![feature(const_trait_bound_opt_out)]
4-
#![allow(incomplete_features)]
53

6-
pub const fn equals_self<T: ?const PartialEq>(t: &T) -> bool {
4+
pub const fn equals_self<T: PartialEq>(t: &T) -> bool {
75
*t == *t
86
//~^ ERROR calls in constant functions are limited to constant functions
97
}

src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-opt-out.rs renamed to src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// check-pass
22

33
#![feature(const_fn_trait_bound)]
4-
#![feature(const_trait_impl)]
5-
#![feature(const_trait_bound_opt_out)]
6-
#![allow(incomplete_features)]
74

85
struct S;
96

src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.gated.stderr

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.rs

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.rs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.stderr

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.stderr

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)