backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change FedDest::{into -> to}_*

Browse source 
They don't need to take ownership of `self`.
This commit is contained in:
Charles Hall 2024-05-16 21:09:42 -07:00
parent e7b8f78867
commit 93a2bf9c93
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/api/server_server.rs
View file

@ -94,14 +94,14 @@ pub(crate) enum FedDest {
} }
impl FedDest { impl FedDest {
fn into_https_string(self) -> String { fn to_https_string(&self) -> String {
match self { match self {
Self::Literal(addr) => format!("https://{addr}"), Self::Literal(addr) => format!("https://{addr}"),
Self::Named(host, port) => format!("https://{host}{port}"), Self::Named(host, port) => format!("https://{host}{port}"),
} }
} }
fn into_uri_string(self) -> String { fn to_uri_string(&self) -> String {
match self { match self {
Self::Literal(addr) => addr.to_string(), Self::Literal(addr) => addr.to_string(),
Self::Named(host, port) => format!("{host}{port}"), Self::Named(host, port) => format!("{host}{port}"),
@ -162,10 +162,10 @@ where
let result = find_actual_destination(destination).await; let result = find_actual_destination(destination).await;
(result.0, result.1.into_uri_string()) (result.0, result.1.to_uri_string())
}; };
let actual_destination_str = actual_destination.clone().into_https_string(); let actual_destination_str = actual_destination.to_https_string();
let mut http_request = request let mut http_request = request
.try_into_http_request::<Vec<u8>>( .try_into_http_request::<Vec<u8>>(
@ -378,7 +378,7 @@ async fn find_actual_destination(
{ {
debug!("3: A .well-known file is available"); debug!("3: A .well-known file is available");
hostname = add_port_to_hostname(&delegated_hostname) hostname = add_port_to_hostname(&delegated_hostname)
.into_uri_string(); .to_uri_string();
if let Some(host_and_port) = if let Some(host_and_port) =
get_ip_with_port(&delegated_hostname) get_ip_with_port(&delegated_hostname)
{ {