rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove SmolStr from project model

Browse Source
This commit is contained in:
Florian Diebold
2019-02-09 10:51:06 +01:00
parent ddbf43b630
commit 12c70871cc
5 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_project_model/src/lib.rs
View File

@@ -47,7 +47,7 @@ impl ProjectWorkspace {
if let (Some(&from), Some(&to)) =
(sysroot_crates.get(&from), sysroot_crates.get(&to))
{
if let Err(_) = crate_graph.add_dep(from, name.clone(), to) {
if let Err(_) = crate_graph.add_dep(from, name.into(), to) {
log::error!("cyclic dependency between sysroot crates")
}
}
@@ -101,7 +101,7 @@ impl ProjectWorkspace {
for dep in pkg.dependencies(&self.cargo) {
if let Some(&to) = pkg_to_lib_crate.get(&dep.pkg) {
for &from in pkg_crates.get(&pkg).into_iter().flatten() {
if let Err(_) = crate_graph.add_dep(from, dep.name.clone(), to) {
if let Err(_) = crate_graph.add_dep(from, dep.name.clone().into(), to) {
log::error!(
"cyclic dependency {} -> {}",
pkg.name(&self.cargo),