nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-02 21:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1359

Browse Source 
1359: don't poison mutex around chalk r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-06-01 08:00:00 +00:00
commit 1e6b45b05a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/ra_hir/src/db.rs
View File

@ -1,5 +1,6 @@
use std::sync::{Arc, Mutex}; use std::sync::Arc;
use parking_lot::Mutex;
use ra_syntax::{SyntaxNode, TreeArc, SmolStr, ast}; use ra_syntax::{SyntaxNode, TreeArc, SmolStr, ast};
use ra_db::{SourceDatabase, salsa}; use ra_db::{SourceDatabase, salsa};

5
crates/ra_hir/src/ty/traits.rs
View File

@ -1,6 +1,7 @@
//! Trait solving using Chalk. //! Trait solving using Chalk.
use std::sync::{Arc, Mutex}; use std::sync::Arc;
use parking_lot::Mutex;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use log::debug; use log::debug;
use chalk_ir::cast::Cast; use chalk_ir::cast::Cast;
@ -61,7 +62,7 @@ fn solve(
let context = ChalkContext { db, krate }; let context = ChalkContext { db, krate };
let solver = db.solver(krate); let solver = db.solver(krate);
debug!("solve goal: {:?}", goal); debug!("solve goal: {:?}", goal);
let solution = solver.lock().unwrap().solve_with_fuel(&context, goal, Some(1000)); let solution = solver.lock().solve_with_fuel(&context, goal, Some(1000));
debug!("solve({:?}) => {:?}", goal, solution); debug!("solve({:?}) => {:?}", goal, solution);
solution solution
} }