Unnamed repository; edit this file 'description' to name the repository.
Merge ref 'b6fdaf2a1573' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@b6fdaf2a15736cbccf248b532f48e33179614d40
Filtered ref: rust-lang/rust-analyzer@21d86db3018b07cccf0e5ab2b2a8459920f0f42c
Upstream diff: https://github.com/rust-lang/rust/compare/44a5b55557c26353f388400d7da95527256fe260...b6fdaf2a15736cbccf248b532f48e33179614d40
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/hir-ty/src/next_solver/solver.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir-ty/src/next_solver/solver.rs b/crates/hir-ty/src/next_solver/solver.rs index 21fbd64dd0..15d6e2e451 100644 --- a/crates/hir-ty/src/next_solver/solver.rs +++ b/crates/hir-ty/src/next_solver/solver.rs @@ -232,8 +232,8 @@ impl<'db> SolverDelegate for SolverContext<'db> { fn is_transmutable( &self, - _dst: Ty<'db>, _src: Ty<'db>, + _dst: Ty<'db>, _assume: <Self::Interner as rustc_type_ir::Interner>::Const, ) -> Result<Certainty, NoSolution> { // It's better to return some value while not fully implement |