matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00
Code Activity

Make Scope use a BTreeSet internally

Browse Source
This commit is contained in:
Kévin Commaille
2022-10-17 13:55:02 +02:00
committed by Quentin Gliech
parent 99f2ca3d57
commit 10297d29bb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/oauth2-types/src/scope.rs
View File

@ -14,7 +14,7 @@
#![allow(clippy::module_name_repetitions)] #![allow(clippy::module_name_repetitions)]
use std::{borrow::Cow, collections::HashSet, iter::FromIterator, ops::Deref, str::FromStr}; use std::{borrow::Cow, collections::BTreeSet, iter::FromIterator, ops::Deref, str::FromStr};
use itertools::Itertools; use itertools::Itertools;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -82,10 +82,10 @@ impl ToString for ScopeToken {
} }
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Scope(HashSet<ScopeToken>); pub struct Scope(BTreeSet<ScopeToken>);
impl std::ops::Deref for Scope { impl std::ops::Deref for Scope {
type Target = HashSet<ScopeToken>; type Target = BTreeSet<ScopeToken>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.0 &self.0
@ -100,7 +100,7 @@ impl FromStr for Scope {
// https://datatracker.ietf.org/doc/html/rfc6749#appendix-A.4 // https://datatracker.ietf.org/doc/html/rfc6749#appendix-A.4
// //
// scope = scope-token *( SP scope-token ) // scope = scope-token *( SP scope-token )
let scopes: Result<HashSet<ScopeToken>, InvalidScope> = let scopes: Result<BTreeSet<ScopeToken>, InvalidScope> =
s.split(' ').map(ScopeToken::from_str).collect(); s.split(' ').map(ScopeToken::from_str).collect();
Ok(Self(scopes?)) Ok(Self(scopes?))
@ -160,7 +160,7 @@ impl<'de> Deserialize<'de> for Scope {
impl FromIterator<ScopeToken> for Scope { impl FromIterator<ScopeToken> for Scope {
fn from_iter<T: IntoIterator<Item = ScopeToken>>(iter: T) -> Self { fn from_iter<T: IntoIterator<Item = ScopeToken>>(iter: T) -> Self {
Self(HashSet::from_iter(iter)) Self(BTreeSet::from_iter(iter))
} }
} }