Merge branch 'main' into jessie-patch-3

Author: raymondk

CHANGELOG.md

@@ -1,3 +1,5 @@
+## Unreleased
+
 ## 3.0.3 (2025-02-04)
 
 ### Fix

examples/http-certification/json-api/src/backend/src/types.rs

@@ -1,4 +1,4 @@
-use ic_http_certification::{HttpRequest, HttpResponse};
+use ic_http_certification::{HttpRequest, HttpResponse, StatusCode};
 use matchit::Params;
 use serde::{Deserialize, Serialize};
 
@@ -18,20 +18,26 @@ pub enum ApiResponse<'a, T = ()> {
 }
 
 impl<'a, T: Serialize> ApiResponse<'a, T> {
-    pub fn ok(data: &'a T) -> ApiResponse<T> {
+    pub fn ok(data: &'a T) -> ApiResponse<'a, T> {
         Self::Ok { data }
     }
 
     pub fn not_found() -> Self {
-        Self::err(404, "Not found".to_string())
+        Self::err(StatusCode::NOT_FOUND, "Not found".to_string())
     }
 
     pub fn not_allowed() -> Self {
-        Self::err(405, "Method not allowed".to_string())
+        Self::err(
+            StatusCode::METHOD_NOT_ALLOWED,
+            "Method not allowed".to_string(),
+        )
     }
 
-    fn err(code: u16, message: String) -> Self {
-        Self::Err { code, message }
+    fn err(code: StatusCode, message: String) -> Self {
+        Self::Err {
+            code: code.as_u16(),
+            message,
+        }
     }
 
     pub fn encode(&self) -> Vec<u8> {