Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f168e79

Browse files
committedDec 4, 2024·
consistently handle global where-bounds
1 parent e27c76f commit f168e79

File tree

6 files changed

+248
-341
lines changed

6 files changed

+248
-341
lines changed
 

‎compiler/rustc_trait_selection/src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#![feature(extract_if)]
2424
#![feature(if_let_guard)]
2525
#![feature(iter_intersperse)]
26+
#![feature(iterator_try_reduce)]
2627
#![feature(let_chains)]
2728
#![feature(never_type)]
2829
#![feature(rustdoc_internals)]

‎compiler/rustc_trait_selection/src/traits/select/mod.rs‎

Lines changed: 241 additions & 305 deletions
Large diffs are not rendered by default.

‎tests/ui/traits/winnowing/global-non-global-env-2.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@ check-pass
2+
13
// A regression test for an edge case of candidate selection
24
// in the old trait solver, see #132325 for more details. Unlike
35
// the first test, this one has two impl candidates.
@@ -12,7 +14,7 @@ where
1214
(): Trait<u32>,
1315
(): Trait<T>,
1416
{
15-
impls_trait(()) //~ ERROR mismatched types
17+
impls_trait(())
1618
}
1719

1820
fn main() {}

‎tests/ui/traits/winnowing/global-non-global-env-2.stderr‎

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

‎tests/ui/traits/winnowing/global-non-global-env-4.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@ check-pass
2+
13
// A regression test for an edge case of candidate selection
24
// in the old trait solver, see #132325 for more details. Unlike
35
// the third test, this one has 3 impl candidates.
@@ -13,7 +15,7 @@ where
1315
(): Trait<T>,
1416
(): Trait<u32>,
1517
{
16-
impls_trait(()) //~ ERROR mismatched types
18+
impls_trait(())
1719
}
1820

1921
fn main() {}

‎tests/ui/traits/winnowing/global-non-global-env-4.stderr‎

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

0 commit comments

Comments
 (0)
Please sign in to comment.