Skip to content

Commit 7af3808

Browse files
hash-worker[bot]indietyp
hash-worker[bot]
and
indietyp
authored
Update Rust toolchains to nightly-2026-01-12 (#8235)
Co-authored-by: hash-worker[bot] <180894564+hash-worker[bot]@users.noreply.github.com> Co-authored-by: Bilal Mahmoud <bmahmoud@mpi-cbg.de>
1 parent ed8cbf4 commit 7af3808

File tree

15 files changed

+134
-107
lines changed

15 files changed

+134
-107
lines changed

‎libs/@local/graph/api/src/rest/data_type.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use std::collections::{HashMap, HashSet};
55

66
use axum::{
77
Extension, Router,
8-
response::Response,
98
routing::{post, put},
109
};
1110
use error_stack::{Report, ResultExt as _};
@@ -46,6 +45,7 @@ use type_system::{
4645
};
4746
use utoipa::{OpenApi, ToSchema};
4847

48+
use super::status::BoxedResponse;
4949
use crate::rest::{
5050
AuthenticatedUserHeader, OpenApiQuery, QueryLogger, RestApiStore,
5151
json::Json,
@@ -170,7 +170,7 @@ async fn create_data_type<S>(
170170
temporal_client: Extension<Option<Arc<TemporalClient>>>,
171171
domain_validator: Extension<DomainValidator>,
172172
body: Json<CreateDataTypeRequest>,
173-
) -> Result<Json<ListOrValue<DataTypeMetadata>>, Response>
173+
) -> Result<Json<ListOrValue<DataTypeMetadata>>, BoxedResponse>
174174
where
175175
S: StorePool + Send + Sync,
176176
for<'pool> S::Store<'pool>: RestApiStore,
@@ -207,7 +207,7 @@ where
207207
conversions: conversions.clone(),
208208
})
209209
})
210-
.collect::<Result<Vec<_>, Response>>()?,
210+
.collect::<Result<Vec<_>, BoxedResponse>>()?,
211211
)
212212
.await
213213
.map_err(report_to_response)?;
@@ -256,7 +256,7 @@ async fn load_external_data_type<S>(
256256
temporal_client: Extension<Option<Arc<TemporalClient>>>,
257257
domain_validator: Extension<DomainValidator>,
258258
Json(request): Json<LoadExternalDataTypeRequest>,
259-
) -> Result<Json<DataTypeMetadata>, Response>
259+
) -> Result<Json<DataTypeMetadata>, BoxedResponse>
260260
where
261261
S: StorePool + Send + Sync,
262262
for<'pool> S::Store<'pool>: RestApiStore,
@@ -343,7 +343,7 @@ async fn query_data_types<S>(
343343
temporal_client: Extension<Option<Arc<TemporalClient>>>,
344344
mut query_logger: Option<Extension<QueryLogger>>,
345345
Json(request): Json<serde_json::Value>,
346-
) -> Result<Json<QueryDataTypesResponse>, Response>
346+
) -> Result<Json<QueryDataTypesResponse>, BoxedResponse>
347347
where
348348
S: StorePool + Send + Sync,
349349
{
@@ -407,7 +407,7 @@ async fn query_data_type_subgraph<S>(
407407
temporal_client: Extension<Option<Arc<TemporalClient>>>,
408408
mut query_logger: Option<Extension<QueryLogger>>,
409409
Json(request): Json<serde_json::Value>,
410-
) -> Result<Json<QueryDataTypeSubgraphResponse>, Response>
410+
) -> Result<Json<QueryDataTypeSubgraphResponse>, BoxedResponse>
411411
where
412412
S: StorePool + Send + Sync,
413413
{
@@ -465,7 +465,7 @@ async fn find_data_type_conversion_targets<S>(
465465
store_pool: Extension<Arc<S>>,
466466
temporal_client: Extension<Option<Arc<TemporalClient>>>,
467467
Json(request): Json<FindDataTypeConversionTargetsParams>,
468-
) -> Result<Json<FindDataTypeConversionTargetsResponse>, Response>
468+
) -> Result<Json<FindDataTypeConversionTargetsResponse>, BoxedResponse>
469469
where
470470
S: StorePool + Send + Sync,
471471
{
@@ -510,7 +510,7 @@ async fn update_data_type<S>(
510510
store_pool: Extension<Arc<S>>,
511511
temporal_client: Extension<Option<Arc<TemporalClient>>>,
512512
body: Json<UpdateDataTypeRequest>,
513-
) -> Result<Json<DataTypeMetadata>, Response>
513+
) -> Result<Json<DataTypeMetadata>, BoxedResponse>
514514
where
515515
S: StorePool + Send + Sync,
516516
{
@@ -565,7 +565,7 @@ async fn update_data_types<S>(
565565
store_pool: Extension<Arc<S>>,
566566
temporal_client: Extension<Option<Arc<TemporalClient>>>,
567567
bodies: Json<Vec<UpdateDataTypeRequest>>,
568-
) -> Result<Json<Vec<DataTypeMetadata>>, Response>
568+
) -> Result<Json<Vec<DataTypeMetadata>>, BoxedResponse>
569569
where
570570
S: StorePool + Send + Sync,
571571
{
@@ -594,7 +594,7 @@ where
594594
})
595595
},
596596
)
597-
.collect::<Result<Vec<_>, Response>>()?;
597+
.collect::<Result<Vec<_>, BoxedResponse>>()?;
598598
store
599599
.update_data_types(actor_id, params)
600600
.await
@@ -622,7 +622,7 @@ async fn update_data_type_embeddings<S>(
622622
store_pool: Extension<Arc<S>>,
623623
temporal_client: Extension<Option<Arc<TemporalClient>>>,
624624
Json(body): Json<serde_json::Value>,
625-
) -> Result<(), Response>
625+
) -> Result<(), BoxedResponse>
626626
where
627627
S: StorePool + Send + Sync,
628628
{
@@ -665,7 +665,7 @@ async fn archive_data_type<S>(
665665
store_pool: Extension<Arc<S>>,
666666
temporal_client: Extension<Option<Arc<TemporalClient>>>,
667667
Json(body): Json<serde_json::Value>,
668-
) -> Result<Json<OntologyTemporalMetadata>, Response>
668+
) -> Result<Json<OntologyTemporalMetadata>, BoxedResponse>
669669
where
670670
S: StorePool + Send + Sync,
671671
{
@@ -717,7 +717,7 @@ async fn unarchive_data_type<S>(
717717
store_pool: Extension<Arc<S>>,
718718
temporal_client: Extension<Option<Arc<TemporalClient>>>,
719719
Json(body): Json<serde_json::Value>,
720-
) -> Result<Json<OntologyTemporalMetadata>, Response>
720+
) -> Result<Json<OntologyTemporalMetadata>, BoxedResponse>
721721
where
722722
S: StorePool + Send + Sync,
723723
{
@@ -766,7 +766,7 @@ async fn has_permission_for_data_types<S>(
766766
temporal_client: Extension<Option<Arc<TemporalClient>>>,
767767
store_pool: Extension<Arc<S>>,
768768
Json(params): Json<HasPermissionForDataTypesParams<'static>>,
769-
) -> Result<Json<HashSet<VersionedUrl>>, Response>
769+
) -> Result<Json<HashSet<VersionedUrl>>, BoxedResponse>
770770
where
771771
S: StorePool + Send + Sync,
772772
for<'p> S::Store<'p>: DataTypeStore,

‎libs/@local/graph/api/src/rest/entity.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use alloc::sync::Arc;
44
use std::collections::HashMap;
55

6-
use axum::{Extension, Router, response::Response, routing::post};
6+
use axum::{Extension, Router, routing::post};
77
use error_stack::{Report, ResultExt as _};
88
use hash_graph_authorization::policies::principal::actor::AuthenticatedActor;
99
use hash_graph_postgres_store::store::error::{EntityDoesNotExist, RaceConditionOnUpdate};
@@ -75,7 +75,7 @@ use type_system::{
7575
};
7676
use utoipa::{OpenApi, ToSchema};
7777

78-
use super::InteractiveHeader;
78+
use super::{InteractiveHeader, status::BoxedResponse};
7979
pub use crate::rest::entity_query_request::{
8080
EntityQuery, EntityQueryOptions, QueryEntitiesRequest, QueryEntitySubgraphRequest,
8181
};
@@ -255,7 +255,7 @@ async fn create_entity<S>(
255255
store_pool: Extension<Arc<S>>,
256256
temporal_client: Extension<Option<Arc<TemporalClient>>>,
257257
Json(body): Json<serde_json::Value>,
258-
) -> Result<Json<Entity>, Response>
258+
) -> Result<Json<Entity>, BoxedResponse>
259259
where
260260
S: StorePool + Send + Sync,
261261
{
@@ -296,7 +296,7 @@ async fn create_entities<S>(
296296
store_pool: Extension<Arc<S>>,
297297
temporal_client: Extension<Option<Arc<TemporalClient>>>,
298298
Json(body): Json<serde_json::Value>,
299-
) -> Result<Json<Vec<Entity>>, Response>
299+
) -> Result<Json<Vec<Entity>>, BoxedResponse>
300300
where
301301
S: StorePool + Send + Sync,
302302
{
@@ -338,7 +338,7 @@ async fn validate_entity<S>(
338338
temporal_client: Extension<Option<Arc<TemporalClient>>>,
339339
mut query_logger: Option<Extension<QueryLogger>>,
340340
Json(body): Json<serde_json::Value>,
341-
) -> Result<Json<HashMap<usize, EntityValidationReport>>, Response>
341+
) -> Result<Json<HashMap<usize, EntityValidationReport>>, BoxedResponse>
342342
where
343343
S: StorePool + Send + Sync,
344344
{
@@ -385,7 +385,7 @@ async fn has_permission_for_entities<S>(
385385
temporal_client: Extension<Option<Arc<TemporalClient>>>,
386386
store_pool: Extension<Arc<S>>,
387387
Json(params): Json<HasPermissionForEntitiesParams<'static>>,
388-
) -> Result<Json<HashMap<EntityId, Vec<EntityEditionId>>>, Response>
388+
) -> Result<Json<HashMap<EntityId, Vec<EntityEditionId>>>, BoxedResponse>
389389
where
390390
S: StorePool + Send + Sync,
391391
for<'p> S::Store<'p>: EntityStore,
@@ -429,7 +429,7 @@ async fn query_entities<S>(
429429
temporal_client: Extension<Option<Arc<TemporalClient>>>,
430430
mut query_logger: Option<Extension<QueryLogger>>,
431431
Json(request): Json<Box<RawJsonvalue>>,
432-
) -> Result<Json<QueryEntitiesResponse<'static>>, Response>
432+
) -> Result<Json<QueryEntitiesResponse<'static>>, BoxedResponse>
433433
where
434434
S: StorePool + Send + Sync,
435435
{
@@ -546,7 +546,7 @@ async fn query_entity_subgraph<S>(
546546
temporal_client: Extension<Option<Arc<TemporalClient>>>,
547547
mut query_logger: Option<Extension<QueryLogger>>,
548548
Json(request): Json<serde_json::Value>,
549-
) -> Result<Json<QueryEntitySubgraphResponse<'static>>, Response>
549+
) -> Result<Json<QueryEntitySubgraphResponse<'static>>, BoxedResponse>
550550
where
551551
S: StorePool + Send + Sync,
552552
{
@@ -629,7 +629,7 @@ async fn count_entities<S>(
629629
temporal_client: Extension<Option<Arc<TemporalClient>>>,
630630
mut query_logger: Option<Extension<QueryLogger>>,
631631
Json(request): Json<serde_json::Value>,
632-
) -> Result<Json<usize>, Response>
632+
) -> Result<Json<usize>, BoxedResponse>
633633
where
634634
S: StorePool + Send + Sync,
635635
{
@@ -680,7 +680,7 @@ async fn patch_entity<S>(
680680
store_pool: Extension<Arc<S>>,
681681
temporal_client: Extension<Option<Arc<TemporalClient>>>,
682682
Json(params): Json<PatchEntityParams>,
683-
) -> Result<Json<Entity>, Response>
683+
) -> Result<Json<Entity>, BoxedResponse>
684684
where
685685
S: StorePool + Send + Sync,
686686
{
@@ -725,7 +725,7 @@ async fn update_entity_embeddings<S>(
725725
store_pool: Extension<Arc<S>>,
726726
temporal_client: Extension<Option<Arc<TemporalClient>>>,
727727
Json(body): Json<serde_json::Value>,
728-
) -> Result<(), Response>
728+
) -> Result<(), BoxedResponse>
729729
where
730730
S: StorePool + Send + Sync,
731731
{
@@ -768,7 +768,7 @@ async fn diff_entity<S>(
768768
temporal_client: Extension<Option<Arc<TemporalClient>>>,
769769
mut query_logger: Option<Extension<QueryLogger>>,
770770
Json(params): Json<DiffEntityParams>,
771-
) -> Result<Json<DiffEntityResult<'static>>, Response>
771+
) -> Result<Json<DiffEntityResult<'static>>, BoxedResponse>
772772
where
773773
S: StorePool + Send + Sync,
774774
{

‎libs/@local/graph/api/src/rest/entity_query_request.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use core::{cmp, ops::Range};
1919

2020
use axum::{
2121
Json,
22-
response::{Html, IntoResponse as _, Response},
22+
response::{Html, IntoResponse as _},
2323
};
2424
use hash_graph_store::{
2525
entity::{
@@ -64,6 +64,8 @@ use serde_json::value::RawValue as RawJsonValue;
6464
use type_system::knowledge::Entity;
6565
use utoipa::ToSchema;
6666

67+
use super::status::BoxedResponse;
68+
6769
#[tracing::instrument(level = "info", skip_all)]
6870
fn generate_sorting_paths(
6971
paths: Option<Vec<EntityQuerySortingRecord<'_>>>,
@@ -282,7 +284,7 @@ fn issues_to_response(
282284
source: &str,
283285
mut spans: &SpanTable<Span>,
284286
options: CompilationOptions,
285-
) -> Response {
287+
) -> BoxedResponse {
286288
let status_code = match severity {
287289
Severity::Bug | Severity::Fatal => StatusCode::INTERNAL_SERVER_ERROR,
288290
Severity::Error => StatusCode::BAD_REQUEST,
@@ -306,15 +308,15 @@ fn issues_to_response(
306308
};
307309

308310
*response.status_mut() = status_code;
309-
response
311+
response.into()
310312
}
311313

312314
fn failure_to_response(
313315
failure: Failure<HashQLDiagnosticCategory, SpanId>,
314316
source: &str,
315317
spans: &SpanTable<Span>,
316318
options: CompilationOptions,
317-
) -> Response {
319+
) -> BoxedResponse {
318320
// Find the highest diagnostic level
319321
let severity = cmp::max(
320322
failure
@@ -445,12 +447,11 @@ impl<'q> EntityQuery<'q> {
445447
/// # Errors
446448
///
447449
/// Returns an error if the HashQL query cannot be compiled.
448-
#[expect(clippy::result_large_err, reason = "precompiled response")]
449450
pub(crate) fn compile(
450451
self,
451452
heap: &'q Heap,
452453
options: CompilationOptions,
453-
) -> Result<Filter<'q, Entity>, Response> {
454+
) -> Result<Filter<'q, Entity>, BoxedResponse> {
454455
match self {
455456
EntityQuery::Filter { filter } => Ok(filter),
456457
EntityQuery::Query { query } => {

0 commit comments

Comments
 (0)