aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty/src/diagnostics
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-07-16 12:17:53 +0100
committerGitHub <[email protected]>2020-07-16 12:17:53 +0100
commit468982e45a035c271c40bea9b17c2c202a7efc75 (patch)
tree96f00583eaa8659a21960fa5fc4717d4d9bf0962 /crates/ra_hir_ty/src/diagnostics
parent8a880230a522b34a0ba7f434f4ad3acdfd3448b1 (diff)
parentb5ce84b17023d27f4e96ec7911aca712db0e000b (diff)
Merge #5405
5405: Align CallableDefId naming with other ids r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/diagnostics')
-rw-r--r--crates/ra_hir_ty/src/diagnostics/unsafe_check.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs b/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs
index 9e4ed9a8b..5cc76bdce 100644
--- a/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs
+++ b/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs
@@ -11,7 +11,7 @@ use hir_def::{
11use hir_expand::diagnostics::DiagnosticSink; 11use hir_expand::diagnostics::DiagnosticSink;
12 12
13use crate::{ 13use crate::{
14 db::HirDatabase, diagnostics::MissingUnsafe, lower::CallableDef, ApplicationTy, 14 db::HirDatabase, diagnostics::MissingUnsafe, lower::CallableDefId, ApplicationTy,
15 InferenceResult, Ty, TypeCtor, 15 InferenceResult, Ty, TypeCtor,
16}; 16};
17 17
@@ -88,7 +88,7 @@ fn walk_unsafe(
88 Expr::Call { callee, .. } => { 88 Expr::Call { callee, .. } => {
89 let ty = &infer[*callee]; 89 let ty = &infer[*callee];
90 if let &Ty::Apply(ApplicationTy { 90 if let &Ty::Apply(ApplicationTy {
91 ctor: TypeCtor::FnDef(CallableDef::FunctionId(func)), 91 ctor: TypeCtor::FnDef(CallableDefId::FunctionId(func)),
92 .. 92 ..
93 }) = ty 93 }) = ty
94 { 94 {