From 06ed140fc7672466bc090fadd95bcf60ed6e82a4 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Fri, 22 May 2020 16:40:42 +0200 Subject: Update Chalk As always, this just makes compilation work, we don't use the newly available functionality yet. --- crates/ra_hir_ty/src/traits/chalk/tls.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_hir_ty/src/traits/chalk/tls.rs') diff --git a/crates/ra_hir_ty/src/traits/chalk/tls.rs b/crates/ra_hir_ty/src/traits/chalk/tls.rs index 4867cb17e..b7eb49d7b 100644 --- a/crates/ra_hir_ty/src/traits/chalk/tls.rs +++ b/crates/ra_hir_ty/src/traits/chalk/tls.rs @@ -1,7 +1,7 @@ //! Implementation of Chalk debug helper functions using TLS. use std::fmt; -use chalk_ir::{AliasTy, Goal, Goals, Lifetime, Parameter, ProgramClauseImplication, TypeName}; +use chalk_ir::{AliasTy, GenericArg, Goal, Goals, Lifetime, ProgramClauseImplication, TypeName}; use itertools::Itertools; use super::{from_chalk, Interner}; @@ -18,7 +18,7 @@ impl DebugContext<'_> { id: super::StructId, f: &mut fmt::Formatter<'_>, ) -> Result<(), fmt::Error> { - let type_ctor: TypeCtor = from_chalk(self.0, TypeName::Struct(id)); + let type_ctor: TypeCtor = from_chalk(self.0, TypeName::Adt(id)); match type_ctor { TypeCtor::Bool => write!(f, "bool")?, TypeCtor::Char => write!(f, "char")?, @@ -188,9 +188,9 @@ impl DebugContext<'_> { write!(fmt, "{:?}", lifetime.data(&Interner)) } - pub fn debug_parameter( + pub fn debug_generic_arg( &self, - parameter: &Parameter, + parameter: &GenericArg, fmt: &mut fmt::Formatter<'_>, ) -> Result<(), fmt::Error> { write!(fmt, "{:?}", parameter.data(&Interner).inner_debug()) -- cgit v1.2.3