chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building on Rust 1.43.0

Browse Source
This commit is contained in:
Jonas Platte 2020-09-29 22:12:56 +02:00
parent e3498fd856
commit 406b8501ac
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruma-api-macros/src/api.rs
View File

@ -355,7 +355,12 @@ impl ToTokens for Api {
.method(#ruma_api_import::exports::http::Method::#method) .method(#ruma_api_import::exports::http::Method::#method)
.uri(::std::format!( .uri(::std::format!(
"{}{}{}", "{}{}{}",
base_url.strip_suffix("/").unwrap_or(base_url), // FIXME: Once MSRV is >= 1.45.0, switch to
// base_url.strip_suffix('/').unwrap_or(base_url),
match base_url.as_bytes().last() {
Some(b'/') => &base_url[..base_url.len() - 1],
_ => base_url,
},
#request_path_string, #request_path_string,
#request_query_string, #request_query_string,
)); ));

7
ruma-client-api/src/r0/message/send_message_event.rs
View File

@ -177,7 +177,12 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> {
.method(http::Method::PUT) .method(http::Method::PUT)
.uri(format!( .uri(format!(
"{}/_matrix/client/r0/rooms/{}/send/{}/{}", "{}/_matrix/client/r0/rooms/{}/send/{}/{}",
base_url.strip_suffix("/").unwrap_or(base_url), // FIXME: Once MSRV is >= 1.45.0, switch to
// base_url.strip_suffix('/').unwrap_or(base_url),
match base_url.as_bytes().last() {
Some(b'/') => &base_url[..base_url.len() - 1],
_ => base_url,
},
utf8_percent_encode(self.room_id.as_str(), NON_ALPHANUMERIC), utf8_percent_encode(self.room_id.as_str(), NON_ALPHANUMERIC),
utf8_percent_encode(self.content.event_type(), NON_ALPHANUMERIC), utf8_percent_encode(self.content.event_type(), NON_ALPHANUMERIC),
utf8_percent_encode(&self.txn_id, NON_ALPHANUMERIC), utf8_percent_encode(&self.txn_id, NON_ALPHANUMERIC),

7
ruma-client-api/src/r0/state/send_state_event_for_empty_key.rs
View File

@ -164,7 +164,12 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> {
.method(http::Method::PUT) .method(http::Method::PUT)
.uri(format!( .uri(format!(
"{}/_matrix/client/r0/rooms/{}/state/{}", "{}/_matrix/client/r0/rooms/{}/state/{}",
base_url.strip_suffix("/").unwrap_or(base_url), // FIXME: Once MSRV is >= 1.45.0, switch to
// base_url.strip_suffix('/').unwrap_or(base_url),
match base_url.as_bytes().last() {
Some(b'/') => &base_url[..base_url.len() - 1],
_ => base_url,
},
utf8_percent_encode(self.room_id.as_str(), NON_ALPHANUMERIC), utf8_percent_encode(self.room_id.as_str(), NON_ALPHANUMERIC),
utf8_percent_encode(self.content.event_type(), NON_ALPHANUMERIC), utf8_percent_encode(self.content.event_type(), NON_ALPHANUMERIC),
)) ))

7
ruma-client-api/src/r0/state/send_state_event_for_key.rs
View File

@ -173,7 +173,12 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> {
.method(http::Method::PUT) .method(http::Method::PUT)
.uri(format!( .uri(format!(
"{}/_matrix/client/r0/rooms/{}/state/{}/{}", "{}/_matrix/client/r0/rooms/{}/state/{}/{}",
base_url.strip_suffix("/").unwrap_or(base_url), // FIXME: Once MSRV is >= 1.45.0, switch to
// base_url.strip_suffix('/').unwrap_or(base_url),
match base_url.as_bytes().last() {
Some(b'/') => &base_url[..base_url.len() - 1],
_ => base_url,
},
utf8_percent_encode(self.room_id.as_str(), NON_ALPHANUMERIC), utf8_percent_encode(self.room_id.as_str(), NON_ALPHANUMERIC),
utf8_percent_encode(self.content.event_type(), NON_ALPHANUMERIC), utf8_percent_encode(self.content.event_type(), NON_ALPHANUMERIC),
utf8_percent_encode(&self.state_key, NON_ALPHANUMERIC), utf8_percent_encode(&self.state_key, NON_ALPHANUMERIC),