diff --git a/Cargo.toml b/Cargo.toml index ed3f5aa..15241da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["codegen-backend"] - [workspace] resolver = "3" members = ["phono-*"] @@ -36,7 +34,5 @@ uuid = { version = "1.11.0", features = ["serde", "v4", "v7"] } validator = { version = "0.20.0", features = ["derive"] } [profile.dev] -# Use experimental compiler backend for ~30% faster dev builds. -codegen-backend = "cranelift" # Skip generating debug info for ~10% faster dev builds. debug = false diff --git a/mise.toml b/mise.toml index 650f1a1..d7d690b 100644 --- a/mise.toml +++ b/mise.toml @@ -1,7 +1,7 @@ [tools] deno = "latest" rebar = "latest" -rust = { version = "nightly", components = "rust-analyzer,clippy,rustc-codegen-cranelift-preview" } +rust = { version = "1.93", components = "rust-analyzer,clippy" } watchexec = "latest" "cargo:sqlx-cli" = "0.8.6" diff --git a/phono-models/src/accessors/portal.rs b/phono-models/src/accessors/portal.rs index 9f20382..29e74f7 100644 --- a/phono-models/src/accessors/portal.rs +++ b/phono-models/src/accessors/portal.rs @@ -93,18 +93,20 @@ impl<'a> Accessor for PortalAccessor<'a> { AccessError::NotFound })?; - spec.verify_workspace_id - .is_none_or(|value| portal.workspace_id == value) - .ok_or_else(|| { - debug!("workspace_id check failed for portal"); - AccessError::NotFound - })?; - spec.verify_rel_oid - .is_none_or(|value| portal.class_oid == value) - .ok_or_else(|| { - debug!("rel_oid check failed for portal"); - AccessError::NotFound - })?; + if spec + .verify_workspace_id + .is_some_and(|value| portal.workspace_id != value) + { + debug!("workspace_id check failed for portal"); + return Err(AccessError::NotFound); + } + if spec + .verify_rel_oid + .is_some_and(|value| portal.class_oid != value) + { + debug!("rel_oid check failed for portal"); + return Err(AccessError::NotFound); + } let rel = if let Some(value) = spec.using_rel { value diff --git a/phono-models/src/lib.rs b/phono-models/src/lib.rs index eda304f..5a37ea4 100644 --- a/phono-models/src/lib.rs +++ b/phono-models/src/lib.rs @@ -14,8 +14,6 @@ // received a copy of the GNU Affero General Public License along with this // program. If not, see . -#![feature(bool_to_result)] // Enable support for `ok_or()` on bools. - pub mod accessors; pub mod client; pub mod cluster;