Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #21471 from rust-lang/rustc-pull
minor: Rustc pull update
| -rw-r--r-- | crates/hir-ty/src/next_solver/solver.rs | 2 | ||||
| -rw-r--r-- | rust-version | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/rust-version b/rust-version index b53a66c667..a6ccd9bab3 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -44a5b55557c26353f388400d7da95527256fe260 +b6fdaf2a15736cbccf248b532f48e33179614d40 |