diff options
| author | bors <bors@rust-lang.org> | 2022-11-21 04:42:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-21 04:42:43 +0000 |
| commit | 736c675d2ab65bcde6554e1b73340c2dbc27c85a (patch) | |
| tree | 8c93d81e4b31ef0013c2e9042e38c12878ff7cb6 /src | |
| parent | ccde51a912e89478a649dc9e64b5584a5971f75f (diff) | |
| parent | cc8dddbac9e04f125c7e81dbe9fb6a01990e8b25 (diff) | |
| download | rust-736c675d2ab65bcde6554e1b73340c2dbc27c85a.tar.gz rust-736c675d2ab65bcde6554e1b73340c2dbc27c85a.zip | |
Auto merge of #103454 - camsteffen:remove-conservatively-uninhabited, r=oli-obk
Factor out `conservative_is_privately_uninhabited` After #102660 there is no more need for `conservative_is_privately_uninhabited`. r? `@oli-obk`
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/const-generics/inhabited-assoc-ty-ice-1.rs (renamed from src/test/ui/const-generics/conservative_is_privately_uninhabited_uses_correct_param_env-1.rs) | 2 | ||||
| -rw-r--r-- | src/test/ui/const-generics/inhabited-assoc-ty-ice-2.rs (renamed from src/test/ui/const-generics/conservative_is_privately_uninhabited_uses_correct_param_env-2.rs) | 2 | ||||
| -rw-r--r-- | src/test/ui/pattern/usefulness/uninhabited.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/const-generics/conservative_is_privately_uninhabited_uses_correct_param_env-1.rs b/src/test/ui/const-generics/inhabited-assoc-ty-ice-1.rs index c9e26c302bf..b385406b020 100644 --- a/src/test/ui/const-generics/conservative_is_privately_uninhabited_uses_correct_param_env-1.rs +++ b/src/test/ui/const-generics/inhabited-assoc-ty-ice-1.rs @@ -2,7 +2,7 @@ #![feature(generic_const_exprs)] #![allow(incomplete_features)] -// This tests that the `conservative_is_privately_uninhabited` fn doesn't cause +// This tests that the inhabited check doesn't cause // ICEs by trying to evaluate `T::ASSOC` with an incorrect `ParamEnv`. trait Foo { diff --git a/src/test/ui/const-generics/conservative_is_privately_uninhabited_uses_correct_param_env-2.rs b/src/test/ui/const-generics/inhabited-assoc-ty-ice-2.rs index 3017920fc98..216d29c7cd4 100644 --- a/src/test/ui/const-generics/conservative_is_privately_uninhabited_uses_correct_param_env-2.rs +++ b/src/test/ui/const-generics/inhabited-assoc-ty-ice-2.rs @@ -2,7 +2,7 @@ #![feature(generic_const_exprs)] #![allow(incomplete_features)] -// This tests that the `conservative_is_privately_uninhabited` fn doesn't cause +// This tests that the inhabited check doesn't cause // ICEs by trying to evaluate `T::ASSOC` with an incorrect `ParamEnv`. trait Foo { diff --git a/src/test/ui/pattern/usefulness/uninhabited.rs b/src/test/ui/pattern/usefulness/uninhabited.rs index 77cd0f4005e..5622808d4c7 100644 --- a/src/test/ui/pattern/usefulness/uninhabited.rs +++ b/src/test/ui/pattern/usefulness/uninhabited.rs @@ -2,7 +2,7 @@ // aux-build:empty.rs // // This tests plays with matching and uninhabited types. This also serves as a test for the -// `tcx.is_ty_uninhabited_from()` function. +// `Ty::is_inhabited_from` function. #![feature(never_type)] #![feature(never_type_fallback)] #![feature(exhaustive_patterns)] |