mirrors/syncstorage-rs
1
0
Fork 0
mirror of https://github.com/mozilla-services/syncstorage-rs.git synced 2025-08-07 12:26:57 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: make pyo3 usage optional per the feature flag (#1731)
Some checks failed
Glean probe-scraper / glean-probe-scraper (push) Has been cancelled
Details

Browse Source 
and cleanup feature flag usage (only specifying defaults in syncserver's
Cargo.toml)

Closes STOR-295
This commit is contained in:
Philip Jenvey 2025-07-29 17:08:29 -07:00 committed by GitHub
parent f8715d4e91
commit 2fb6b84ad4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncserver/Cargo.toml
View File

@ -47,7 +47,7 @@ syncserver-settings = { path = "../syncserver-settings" }
syncstorage-db = { path = "../syncstorage-db" } syncstorage-db = { path = "../syncstorage-db" }
syncstorage-settings = { path = "../syncstorage-settings" } syncstorage-settings = { path = "../syncstorage-settings" }
time = "^0.3" time = "^0.3"
tokenserver-auth = { path = "../tokenserver-auth", default-features = false } tokenserver-auth = { path = "../tokenserver-auth" }
tokenserver-common = { path = "../tokenserver-common" } tokenserver-common = { path = "../tokenserver-common" }
tokenserver-db = { path = "../tokenserver-db" } tokenserver-db = { path = "../tokenserver-db" }
tokenserver-settings = { path = "../tokenserver-settings" } tokenserver-settings = { path = "../tokenserver-settings" }
@ -60,7 +60,7 @@ woothee = "0.13"
[features] [features]
default = ["mysql", "py_verifier"] default = ["mysql", "py_verifier"]
no_auth = [] no_auth = []
py_verifier = ["tokenserver-auth/py"] py_verifier = ["tokenserver-auth/py", "tokenserver-common/py"]
mysql = ["syncstorage-db/mysql"] mysql = ["syncstorage-db/mysql"]
spanner = ["syncstorage-db/spanner"] spanner = ["syncstorage-db/spanner"]
actix-compress = ["actix-web/compress-brotli", "actix-web/compress-gzip", "actix-web/compress-zstd"] actix-compress = ["actix-web/compress-brotli", "actix-web/compress-gzip", "actix-web/compress-zstd"]

3
tokenserver-auth/Cargo.toml
View File

@ -36,5 +36,4 @@ mockito = "1.4.0"
tokio = { workspace = true, features = ["macros"] } tokio = { workspace = true, features = ["macros"] }
[features] [features]
default = ["py"] py = ["pyo3", "tokenserver-common/py"]
py = ["pyo3"]

1
tokenserver-common/Cargo.toml
View File

@ -15,5 +15,4 @@ pyo3 = { version = "0.24", features = ["auto-initialize"], optional = true }
syncserver-common = { path = "../syncserver-common" } syncserver-common = { path = "../syncserver-common" }
[features] [features]
default = ["py"]
py = ["pyo3"] py = ["pyo3"]

6
tokenserver-common/src/error.rs
View File

@ -3,7 +3,6 @@ use std::{cmp::PartialEq, error::Error, fmt};
use actix_web::{HttpResponse, ResponseError}; use actix_web::{HttpResponse, ResponseError};
use backtrace::Backtrace; use backtrace::Backtrace;
use http::StatusCode; use http::StatusCode;
use pyo3::prelude::PyErr;
use serde::{ use serde::{
ser::{SerializeMap, Serializer}, ser::{SerializeMap, Serializer},
Serialize, Serialize,
@ -326,8 +325,9 @@ impl InternalError for TokenserverError {
} }
} }
impl From<PyErr> for TokenserverError { #[cfg(feature = "py")]
fn from(err: PyErr) -> Self { impl From<pyo3::prelude::PyErr> for TokenserverError {
fn from(err: pyo3::prelude::PyErr) -> Self {
InternalError::internal_error(err.to_string()) InternalError::internal_error(err.to_string())
} }
} }