From 26463f189ff75e92990375ee5ae08d3903d39e66 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 21 May 2019 18:57:33 +0300 Subject: [PATCH] publish gen_lsp_server 0.2 --- Cargo.lock | 4 ++-- crates/gen_lsp_server/Cargo.toml | 2 +- crates/ra_hir/src/ty/traits.rs | 33 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02adbe0a96..d8ada0757b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -487,7 +487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "gen_lsp_server" -version = "0.1.0" +version = "0.2.0" dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1165,7 +1165,7 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gen_lsp_server 0.1.0", + "gen_lsp_server 0.2.0", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lsp-types 0.57.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml index 34343e2f25..ba8bfdbd39 100644 --- a/crates/gen_lsp_server/Cargo.toml +++ b/crates/gen_lsp_server/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2018" name = "gen_lsp_server" -version = "0.1.0" +version = "0.2.0" authors = ["rust-analyzer developers"] repository = "https://github.com/rust-analyzer/rust-analyzer" license = "MIT OR Apache-2.0" diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs index f39749cab5..908c00209b 100644 --- a/crates/ra_hir/src/ty/traits.rs +++ b/crates/ra_hir/src/ty/traits.rs @@ -78,23 +78,24 @@ pub enum Obligation { /// Check using Chalk whether trait is implemented for given parameters including `Self` type. pub(crate) fn implements_query( - db: &impl HirDatabase, - krate: Crate, - trait_ref: Canonical, + _db: &impl HirDatabase, + _krate: Crate, + _trait_ref: Canonical, ) -> Option { - let _p = profile("implements_query"); - let goal: chalk_ir::Goal = trait_ref.value.to_chalk(db).cast(); - debug!("goal: {:?}", goal); - let env = chalk_ir::Environment::new(); - let in_env = chalk_ir::InEnvironment::new(&env, goal); - let parameter = chalk_ir::ParameterKind::Ty(chalk_ir::UniverseIndex::ROOT); - let canonical = - chalk_ir::Canonical { value: in_env, binders: vec![parameter; trait_ref.num_vars] }; - // We currently don't deal with universes (I think / hope they're not yet - // relevant for our use cases?) - let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 }; - let solution = solve(db, krate, &u_canonical); - solution.map(|solution| solution_from_chalk(db, solution)) + return None; + // let _p = profile("implements_query"); + // let goal: chalk_ir::Goal = trait_ref.value.to_chalk(db).cast(); + // debug!("goal: {:?}", goal); + // let env = chalk_ir::Environment::new(); + // let in_env = chalk_ir::InEnvironment::new(&env, goal); + // let parameter = chalk_ir::ParameterKind::Ty(chalk_ir::UniverseIndex::ROOT); + // let canonical = + // chalk_ir::Canonical { value: in_env, binders: vec![parameter; trait_ref.num_vars] }; + // // We currently don't deal with universes (I think / hope they're not yet + // // relevant for our use cases?) + // let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 }; + // let solution = solve(db, krate, &u_canonical); + // solution.map(|solution| solution_from_chalk(db, solution)) } fn solution_from_chalk(db: &impl HirDatabase, solution: chalk_solve::Solution) -> Solution {