From 7e104ea4a885c8fd6f348a0d7d30911fe49d91e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 22 Jun 2020 14:18:10 +0300 Subject: Bump chalk --- crates/ra_hir_ty/src/tests/coercion.rs | 42 +++++++++++++++++++--------------- crates/ra_hir_ty/src/tests/traits.rs | 8 +++---- 2 files changed, 27 insertions(+), 23 deletions(-) (limited to 'crates/ra_hir_ty/src/tests') diff --git a/crates/ra_hir_ty/src/tests/coercion.rs b/crates/ra_hir_ty/src/tests/coercion.rs index a2601c68a..5a1c6ccc3 100644 --- a/crates/ra_hir_ty/src/tests/coercion.rs +++ b/crates/ra_hir_ty/src/tests/coercion.rs @@ -664,6 +664,8 @@ fn test() { fn coerce_unsize_trait_object() { assert_snapshot!( infer_with_mismatches(r#" +#[lang = "sized"] +pub trait Sized {} #[lang = "unsize"] pub trait Unsize {} #[lang = "coerce_unsized"] @@ -689,19 +691,19 @@ fn test() { } "#, true), @r###" - 387..572 '{ ...bj2; }': () - 397..400 'obj': &dyn Baz - 422..424 '&S': &S - 423..424 'S': S - 434..437 'obj': &dyn Bar - 459..462 'obj': &dyn Baz - 472..475 'obj': &dyn Foo - 494..497 'obj': &dyn Bar - 507..511 'obj2': &dyn Baz - 533..535 '&S': &S - 534..535 'S': S - 545..546 '_': &dyn Foo - 565..569 'obj2': &dyn Baz + 424..609 '{ ...bj2; }': () + 434..437 'obj': &dyn Baz + 459..461 '&S': &S + 460..461 'S': S + 471..474 'obj': &dyn Bar + 496..499 'obj': &dyn Baz + 509..512 'obj': &dyn Foo + 531..534 'obj': &dyn Bar + 544..548 'obj2': &dyn Baz + 570..572 '&S': &S + 571..572 'S': S + 582..583 '_': &dyn Foo + 602..606 'obj2': &dyn Baz "### ); } @@ -710,6 +712,8 @@ fn test() { fn coerce_unsize_super_trait_cycle() { assert_snapshot!( infer_with_mismatches(r#" +#[lang = "sized"] +pub trait Sized {} #[lang = "unsize"] pub trait Unsize {} #[lang = "coerce_unsized"] @@ -734,12 +738,12 @@ fn test() { } "#, true), @r###" - 291..347 '{ ...obj; }': () - 301..304 'obj': &dyn D - 315..317 '&S': &S - 316..317 'S': S - 327..330 'obj': &dyn A - 341..344 'obj': &dyn D + 328..384 '{ ...obj; }': () + 338..341 'obj': &dyn D + 352..354 '&S': &S + 353..354 'S': S + 364..367 'obj': &dyn A + 378..381 'obj': &dyn D "### ); } diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs index 646e1715c..71c0c2d27 100644 --- a/crates/ra_hir_ty/src/tests/traits.rs +++ b/crates/ra_hir_ty/src/tests/traits.rs @@ -1753,11 +1753,11 @@ fn test() { 384..500 '{ ...(f); }': () 394..397 'bar': Bar u32> 423..426 'bar': Bar u32> - 423..432 'bar.foo()': {unknown} + 423..432 'bar.foo()': (u8, u32) 443..446 'opt': Opt 465..466 'f': fn(u8) -> u32 487..490 'opt': Opt - 487..497 'opt.map(f)': Opt u32, (u8,)>> + 487..497 'opt.map(f)': Opt 495..496 'f': fn(u8) -> u32 "### ); @@ -1830,9 +1830,9 @@ fn test() { 634..643 'Lazy::new': fn new Foo>(fn() -> Foo) -> Lazy Foo> 634..660 'Lazy::...n_ptr)': Lazy Foo> 644..659 'make_foo_fn_ptr': fn() -> Foo - 670..672 'r2': {unknown} + 670..672 'r2': usize 675..680 'lazy2': Lazy Foo> - 675..686 'lazy2.foo()': {unknown} + 675..686 'lazy2.foo()': usize 549..551 '{}': () "### ); -- cgit v1.2.3