squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Add marks

Browse source
This commit is contained in:
Florian Diebold 2019-01-26 23:57:03 +01:00
parent 77f92674f9
commit 94bbb2418a
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir/src/marks.rs
View file

@ -1,4 +1,6 @@
test_utils::marks!( test_utils::marks!(
name_res_works_for_broken_modules name_res_works_for_broken_modules
item_map_enum_importing item_map_enum_importing
type_var_cycles_resolve_completely
type_var_cycles_resolve_as_possible
); );

4
crates/ra_hir/src/ty.rs
View file

@ -29,6 +29,8 @@ use ra_arena::map::ArenaMap;
use join_to_string::join; use join_to_string::join;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use test_utils::tested_by;
use crate::{ use crate::{
Module, Function, Struct, StructField, Enum, EnumVariant, Path, Name, ImplBlock, Module, Function, Struct, StructField, Enum, EnumVariant, Path, Name, ImplBlock,
FnSignature, FnScopes, ModuleDef, AdtDef, FnSignature, FnScopes, ModuleDef, AdtDef,
@ -1020,6 +1022,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
Ty::Infer(tv) => { Ty::Infer(tv) => {
let inner = tv.to_inner(); let inner = tv.to_inner();
if tv_stack.contains(&inner) { if tv_stack.contains(&inner) {
tested_by!(type_var_cycles_resolve_as_possible);
// recursive type // recursive type
return tv.fallback_value(); return tv.fallback_value();
} }
@ -1062,6 +1065,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
Ty::Infer(tv) => { Ty::Infer(tv) => {
let inner = tv.to_inner(); let inner = tv.to_inner();
if tv_stack.contains(&inner) { if tv_stack.contains(&inner) {
tested_by!(type_var_cycles_resolve_completely);
// recursive type // recursive type
return tv.fallback_value(); return tv.fallback_value();
} }

5
crates/ra_hir/src/ty/tests.rs
View file

@ -3,6 +3,7 @@ use std::fmt::Write;
use ra_db::{SourceDatabase, salsa::Database}; use ra_db::{SourceDatabase, salsa::Database};
use ra_syntax::ast::{self, AstNode}; use ra_syntax::ast::{self, AstNode};
use test_utils::covers;
use crate::{ use crate::{
source_binder, source_binder,
@ -564,6 +565,8 @@ fn quux() {
#[test] #[test]
fn recursive_vars() { fn recursive_vars() {
covers!(type_var_cycles_resolve_completely);
covers!(type_var_cycles_resolve_as_possible);
check_inference( check_inference(
"recursive_vars", "recursive_vars",
r#" r#"
@ -577,6 +580,8 @@ fn test() {
#[test] #[test]
fn recursive_vars_2() { fn recursive_vars_2() {
covers!(type_var_cycles_resolve_completely);
covers!(type_var_cycles_resolve_as_possible);
check_inference( check_inference(
"recursive_vars_2", "recursive_vars_2",
r#" r#"