radicle/radicle-explorer
1
0
Fork 0
mirror of https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git synced 2026-11-03 02:30:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Rust toolchain to 1.74

Browse Source
This commit is contained in:
cloudhead
2023-11-17 16:58:24 +01:00
parent 73fd313671
commit d707f0978e
4 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radicle-httpd/src/api/json.rs
+1 -1
View File
@@ -137,7 +137,7 @@ pub(crate) fn patch(
"description": rev.description(),
"base": rev.base(),
"oid": rev.head(),
"refs": get_refs(repo, patch.author().id(), &rev.head()).unwrap_or(vec![]),
"refs": get_refs(repo, patch.author().id(), &rev.head()).unwrap_or_default(),
"discussions": rev.discussion().comments()
.map(|(id, comment)| Comment::new(id, comment, aliases))
.collect::<Vec<_>>(),
radicle-httpd/src/api/v1/delegates.rs
+24 -8
View File
@@ -40,19 +40,35 @@ async fn delegates_projects_handler(
.inventory()?
.into_iter()
.filter_map(|id| {
let Ok(repo) = storage.repository(id) else { return None };
let Ok((_, head)) = repo.head() else { return None };
let Ok(DocAt { doc, .. }) = repo.identity_doc() else { return None };
let Ok(payload) = doc.project() else { return None };
let Ok(repo) = storage.repository(id) else {
return None;
};
let Ok((_, head)) = repo.head() else {
return None;
};
let Ok(DocAt { doc, .. }) = repo.identity_doc() else {
return None;
};
let Ok(payload) = doc.project() else {
return None;
};
if !doc.delegates.iter().any(|d| *d == delegate) {
return None;
}
let Ok(issues) = Issues::open(&repo) else { return None };
let Ok(issues) = issues.counts() else { return None };
let Ok(patches) = Patches::open(&repo) else { return None };
let Ok(patches) = patches.counts() else { return None };
let Ok(issues) = Issues::open(&repo) else {
return None;
};
let Ok(issues) = issues.counts() else {
return None;
};
let Ok(patches) = Patches::open(&repo) else {
return None;
};
let Ok(patches) = patches.counts() else {
return None;
};
let delegates = doc.delegates;
let trackings = routing.count(&id).unwrap_or_default();
radicle-httpd/src/api/v1/projects.rs
+24 -8
View File
@@ -87,15 +87,31 @@ async fn project_root_handler(
.inventory()?
.into_iter()
.filter_map(|id| {
let Ok(repo) = storage.repository(id) else { return None };
let Ok((_, head)) = repo.head() else { return None };
let Ok(DocAt { doc, .. }) = repo.identity_doc() else { return None };
let Ok(repo) = storage.repository(id) else {
return None;
};
let Ok((_, head)) = repo.head() else {
return None;
};
let Ok(DocAt { doc, .. }) = repo.identity_doc() else {
return None;
};
let Ok(payload) = doc.project() else { return None };
let Ok(issues) = issue::Issues::open(&repo) else { return None };
let Ok(issues) = issues.counts() else { return None };
let Ok(patches) = patch::Patches::open(&repo) else { return None };
let Ok(patches) = patches.counts() else { return None };
let Ok(payload) = doc.project() else {
return None;
};
let Ok(issues) = issue::Issues::open(&repo) else {
return None;
};
let Ok(issues) = issues.counts() else {
return None;
};
let Ok(patches) = patch::Patches::open(&repo) else {
return None;
};
let Ok(patches) = patches.counts() else {
return None;
};
let delegates = doc.delegates;
let trackings = routing.count(&id).unwrap_or_default();
radicle-httpd/src/test.rs
+1 -1
View File
@@ -95,7 +95,7 @@ pub fn contributor(dir: &Path) -> Context {
}
fn seed_with_signer<G: Signer>(dir: &Path, profile: radicle::Profile, signer: &G) -> Context {
const DEFAULT_BRANCH: &'static str = "master";
const DEFAULT_BRANCH: &str = "master";
let tracking_db = dir.join("radicle").join("node").join("tracking.db");
let routing_db = dir.join("radicle").join("node").join("routing.db");