diff options
author | Kornel <kornel@geekhood.net> | 2019-07-29 22:36:04 +0100 |
---|---|---|
committer | Kornel <kornel@geekhood.net> | 2019-07-29 22:36:04 +0100 |
commit | 5f5ddc4ccd57820ee58054f3f9618bab830bcb9b (patch) | |
tree | 04a12a7f1acecfdb0523bd102fb514183d0bcde4 /crate_db/src/lib_crate_db.rs | |
parent | d6934201cc4f4c5a699e8d04fc5fa44afa96994f (diff) |
Bump rusqlite
Diffstat (limited to 'crate_db/src/lib_crate_db.rs')
-rw-r--r-- | crate_db/src/lib_crate_db.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crate_db/src/lib_crate_db.rs b/crate_db/src/lib_crate_db.rs index aff15bf..063cf87 100644 --- a/crate_db/src/lib_crate_db.rs +++ b/crate_db/src/lib_crate_db.rs @@ -350,7 +350,7 @@ impl CrateDb { } /// Returns crate name (not origin) - pub fn parent_crate(&self, repo: &Repo, child_name: &str) -> FResult<Option<String>> { + pub fn parent_crate(&self, repo: &Repo, child_name: &str) -> FResult<Option<Origin>> { self.with_connection(|conn| { let mut paths = conn.prepare_cached("SELECT path, crate_name FROM repo_crates WHERE repo = ?1 LIMIT 100")?; let mut paths: HashMap<String, String> = paths @@ -370,7 +370,7 @@ impl CrateDb { loop { child_path = child_path.rsplitn(2, '/').nth(1).unwrap_or(""); if let Some(child) = paths.get(child_path) { - return Ok(Some(child.to_owned())); + return Ok(Some(Origin::from_crates_io_name(child))); } if child_path.is_empty() { // in these paths "" is the root @@ -392,9 +392,9 @@ impl CrateDb { } Ok(if let Some(child) = repo.repo_name().and_then(|n| paths.get(n).or_else(|| paths.get(unprefix(n)))) { - Some(child.to_owned()) + Some(Origin::from_crates_io_name(child)) } else if let Some(child) = repo.owner_name().and_then(|n| paths.get(n).or_else(|| paths.get(unprefix(n)))) { - Some(child.to_owned()) + Some(Origin::from_crates_io_name(child)) } else { None }) |