Skip to content

Commit 998ffec

Browse files
crowlKatscrowlKats
authored
fix: update deno_doc (jsr-io#871)
1 parent 34603e9 commit 998ffec

21 files changed

+548
-224
lines changed

‎Cargo.lock

Lines changed: 378 additions & 88 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ serde = { version = "1", features = ["derive"] }
4949
serde_json = "1"
5050
tokio = { version = "1", features = ["full"] }
5151
tokio-stream = "0.1"
52-
url = "2"
52+
url = "2.5.4"
5353
uuid = { version = "1", features = ["v4", "serde"] }
5454
clap = { version = "4", default-features = false, features = [
5555
"derive",
@@ -74,13 +74,13 @@ opentelemetry = { version = "0.19", features = [
7474
] }
7575
opentelemetry-otlp = "0.12"
7676
opentelemetry-gcloud-trace = "0.5.0"
77-
deno_semver = "0.5.2"
77+
deno_semver = "0.6.0"
7878
flate2 = "1"
79-
thiserror = "1"
79+
thiserror = "2"
8080
async-tar = "0.4.2"
81-
deno_graph = "0.85.1"
82-
deno_ast = { version = "0.43.3", features = ["view"] }
83-
deno_doc = { version = "0.161.0", features = ["comrak"] }
81+
deno_graph = "0.86.3"
82+
deno_ast = { version = "0.44.0", features = ["view"] }
83+
deno_doc = { version = "0.162.1", features = ["comrak"] }
8484
comrak = { version = "0.29.0", default-features = false }
8585
ammonia = "4.0.0"
8686
async-trait = "0.1.73"
@@ -92,7 +92,7 @@ regex = "1.10.2"
9292
postmark = { version = "=0.10.0", features = ["reqwest-rustls-tls"] }
9393
handlebars = "5.0.0"
9494
jsonc-parser = { version = "0.23", features = ["serde"] }
95-
deno_npm = "0.25.0"
95+
deno_npm = "0.26.0"
9696
sha1 = "0.10.6"
9797
infer = "0.15.0"
9898
x509-parser = { version = "0.15.1", features = ["verify"] }
@@ -114,5 +114,5 @@ lazy_static = "1.5.0"
114114

115115
[dev-dependencies]
116116
flate2 = "1"
117-
deno_semver = "0.5.1"
117+
deno_semver = "0.6.0"
118118
pretty_assertions = "1.4.0"

‎api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This Dockerfile is adapted from https://whitfin.io/blog/speeding-up-rust-docker-builds/
22

3-
FROM rust:1.77 as build
3+
FROM rust:1.83 as build
44

55
# create a new empty shell project
66
RUN USER=root cargo new --bin registry_api

‎api/src/analysis.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ impl deno_graph::source::Resolver for JsrResolver {
418418
&self,
419419
specifier_text: &str,
420420
referrer_range: &deno_graph::Range,
421-
_mode: deno_graph::source::ResolutionMode,
421+
_kind: deno_graph::source::ResolutionKind,
422422
) -> Result<ModuleSpecifier, deno_graph::source::ResolveError> {
423423
if let Ok(package_ref) = JsrPackageReqReference::from_str(specifier_text) {
424424
if self.member.name == package_ref.req().name
@@ -454,7 +454,7 @@ struct SyncLoader<'a> {
454454
files: &'a HashMap<PackagePath, Vec<u8>>,
455455
}
456456

457-
impl<'a> SyncLoader<'a> {
457+
impl SyncLoader<'_> {
458458
fn load_sync(
459459
&self,
460460
specifier: &ModuleSpecifier,
@@ -484,7 +484,7 @@ impl<'a> SyncLoader<'a> {
484484
}
485485
}
486486

487-
impl<'a> deno_graph::source::Loader for SyncLoader<'a> {
487+
impl deno_graph::source::Loader for SyncLoader<'_> {
488488
fn load(
489489
&self,
490490
specifier: &ModuleSpecifier,
@@ -628,7 +628,7 @@ struct GcsLoader<'a> {
628628
version: &'a Version,
629629
}
630630

631-
impl<'a> GcsLoader<'a> {
631+
impl GcsLoader<'_> {
632632
fn load_inner(
633633
&self,
634634
specifier: &ModuleSpecifier,
@@ -669,7 +669,7 @@ impl<'a> GcsLoader<'a> {
669669
}
670670
}
671671

672-
impl<'a> deno_graph::source::Loader for GcsLoader<'a> {
672+
impl deno_graph::source::Loader for GcsLoader<'_> {
673673
fn load(
674674
&self,
675675
specifier: &ModuleSpecifier,

‎api/src/api/admin.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pub async fn update_user(mut req: Request<Body>) -> ApiResult<ApiFullUser> {
114114
iam.check_admin_access()?;
115115

116116
let user_id = req.param_uuid("user_id")?;
117-
Span::current().record("user_id", &field::display(&user_id));
117+
Span::current().record("user_id", field::display(&user_id));
118118
let ApiAdminUpdateUserRequest {
119119
is_staff,
120120
is_blocked,
@@ -172,7 +172,7 @@ pub async fn patch_scopes(mut req: Request<Body>) -> ApiResult<ApiFullScope> {
172172
iam.check_admin_access()?;
173173

174174
let scope = req.param_scope()?;
175-
Span::current().record("scope", &field::display(&scope));
175+
Span::current().record("scope", field::display(&scope));
176176

177177
let ApiAdminUpdateScopeRequest {
178178
package_limit,
@@ -214,8 +214,8 @@ pub async fn assign_scope(mut req: Request<Body>) -> ApiResult<ApiScope> {
214214
iam.check_admin_access()?;
215215

216216
let ApiAssignScopeRequest { scope, user_id } = decode_json(&mut req).await?;
217-
Span::current().record("scope", &field::display(&scope));
218-
Span::current().record("user_id", &field::display(&user_id));
217+
Span::current().record("scope", field::display(&scope));
218+
Span::current().record("user_id", field::display(&user_id));
219219

220220
let db = req.data::<Database>().unwrap();
221221

@@ -268,7 +268,7 @@ pub async fn requeue_publishing_tasks(req: Request<Body>) -> ApiResult<()> {
268268

269269
let publishing_task_id = req.param_uuid("publishing_task")?;
270270
Span::current()
271-
.record("publishing_task", &field::display(&publishing_task_id));
271+
.record("publishing_task", field::display(&publishing_task_id));
272272

273273
let db = req.data::<Database>().unwrap().clone();
274274
let task = db

‎api/src/api/authorization.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ mod tests {
302302

303303
async fn details(t: &mut TestSetup, code: &str) -> Response<Body> {
304304
t.http()
305-
.get(&format!("/api/authorizations/details/{}", code))
305+
.get(format!("/api/authorizations/details/{}", code))
306306
.call()
307307
.await
308308
.unwrap()
@@ -335,7 +335,7 @@ mod tests {
335335

336336
let mut resp = t
337337
.http()
338-
.post(&format!("/api/authorizations/approve/{}", auth.code))
338+
.post(format!("/api/authorizations/approve/{}", auth.code))
339339
.call()
340340
.await
341341
.unwrap();
@@ -399,7 +399,7 @@ mod tests {
399399

400400
let mut resp = t
401401
.http()
402-
.post(&format!("/api/authorizations/approve/{}", auth.code))
402+
.post(format!("/api/authorizations/approve/{}", auth.code))
403403
.call()
404404
.await
405405
.unwrap();
@@ -454,7 +454,7 @@ mod tests {
454454

455455
let mut resp = t
456456
.http()
457-
.post(&format!("/api/authorizations/deny/{}", auth.code))
457+
.post(format!("/api/authorizations/deny/{}", auth.code))
458458
.call()
459459
.await
460460
.unwrap();

0 commit comments

Comments
 (0)