Skip to content

Commit 7e104ea

Browse files
committed
Bump chalk
1 parent 38cd1b7 commit 7e104ea

File tree

7 files changed

+281
-59
lines changed

7 files changed

+281
-59
lines changed

Cargo.lock

+172-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/ra_hir_ty/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ test_utils = { path = "../test_utils" }
2727

2828
scoped-tls = "1"
2929

30-
chalk-solve = "0.11"
31-
chalk-ir = "0.11"
30+
chalk-solve = { version = "0.15.0-dev.0", git = "https://github.com/rust-lang/chalk" }
31+
chalk-ir = { version = "0.15.0-dev.0", git = "https://github.com/rust-lang/chalk" }
3232

3333
[dev-dependencies]
3434
insta = "0.16.0"

crates/ra_hir_ty/src/tests/coercion.rs

+23-19
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,8 @@ fn test() {
664664
fn coerce_unsize_trait_object() {
665665
assert_snapshot!(
666666
infer_with_mismatches(r#"
667+
#[lang = "sized"]
668+
pub trait Sized {}
667669
#[lang = "unsize"]
668670
pub trait Unsize<T> {}
669671
#[lang = "coerce_unsized"]
@@ -689,19 +691,19 @@ fn test() {
689691
}
690692
"#, true),
691693
@r###"
692-
387..572 '{ ...bj2; }': ()
693-
397..400 'obj': &dyn Baz<i8, i16>
694-
422..424 '&S': &S<i8, i16>
695-
423..424 'S': S<i8, i16>
696-
434..437 'obj': &dyn Bar<usize, i8, i16>
697-
459..462 'obj': &dyn Baz<i8, i16>
698-
472..475 'obj': &dyn Foo<i8, usize>
699-
494..497 'obj': &dyn Bar<usize, i8, i16>
700-
507..511 'obj2': &dyn Baz<i8, i16>
701-
533..535 '&S': &S<i8, i16>
702-
534..535 'S': S<i8, i16>
703-
545..546 '_': &dyn Foo<i8, usize>
704-
565..569 'obj2': &dyn Baz<i8, i16>
694+
424..609 '{ ...bj2; }': ()
695+
434..437 'obj': &dyn Baz<i8, i16>
696+
459..461 '&S': &S<i8, i16>
697+
460..461 'S': S<i8, i16>
698+
471..474 'obj': &dyn Bar<usize, i8, i16>
699+
496..499 'obj': &dyn Baz<i8, i16>
700+
509..512 'obj': &dyn Foo<i8, usize>
701+
531..534 'obj': &dyn Bar<usize, i8, i16>
702+
544..548 'obj2': &dyn Baz<i8, i16>
703+
570..572 '&S': &S<i8, i16>
704+
571..572 'S': S<i8, i16>
705+
582..583 '_': &dyn Foo<i8, usize>
706+
602..606 'obj2': &dyn Baz<i8, i16>
705707
"###
706708
);
707709
}
@@ -710,6 +712,8 @@ fn test() {
710712
fn coerce_unsize_super_trait_cycle() {
711713
assert_snapshot!(
712714
infer_with_mismatches(r#"
715+
#[lang = "sized"]
716+
pub trait Sized {}
713717
#[lang = "unsize"]
714718
pub trait Unsize<T> {}
715719
#[lang = "coerce_unsized"]
@@ -734,12 +738,12 @@ fn test() {
734738
}
735739
"#, true),
736740
@r###"
737-
291..347 '{ ...obj; }': ()
738-
301..304 'obj': &dyn D
739-
315..317 '&S': &S
740-
316..317 'S': S
741-
327..330 'obj': &dyn A
742-
341..344 'obj': &dyn D
741+
328..384 '{ ...obj; }': ()
742+
338..341 'obj': &dyn D
743+
352..354 '&S': &S
744+
353..354 'S': S
745+
364..367 'obj': &dyn A
746+
378..381 'obj': &dyn D
743747
"###
744748
);
745749
}

0 commit comments

Comments
 (0)