Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 12:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the build warning of deprecated trim_right_matches (#2662)

Browse source
This commit is contained in:
Gary Yu 2019-03-11 11:13:42 +08:00 committed by Ignotus Peverell
parent 699d85a799
commit 608973c498
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/src/handlers/peers_api.rs
View file

@ -79,7 +79,7 @@ impl Handler for PeerHandler {
} }
} }
fn post(&self, req: Request<Body>) -> ResponseFuture { fn post(&self, req: Request<Body>) -> ResponseFuture {
let mut path_elems = req.uri().path().trim_right_matches('/').rsplit('/'); let mut path_elems = req.uri().path().trim_end_matches('/').rsplit('/');
let command = match path_elems.next() { let command = match path_elems.next() {
None => return response(StatusCode::BAD_REQUEST, "invalid url"), None => return response(StatusCode::BAD_REQUEST, "invalid url"),
Some(c) => c, Some(c) => c,

4
core/src/core.rs
View file

@ -95,9 +95,9 @@ pub fn amount_to_hr_string(amount: u64, truncate: bool) -> String {
if truncate { if truncate {
let nzeros = hr.chars().rev().take_while(|x| x == &'0').count(); let nzeros = hr.chars().rev().take_while(|x| x == &'0').count();
if nzeros < *WIDTH { if nzeros < *WIDTH {
return hr.trim_right_matches('0').to_string(); return hr.trim_end_matches('0').to_string();
} else { } else {
return format!("{}0", hr.trim_right_matches('0')); return format!("{}0", hr.trim_end_matches('0'));
} }
} }
hr hr

6
wallet/src/controller.rs
View file

@ -300,7 +300,7 @@ where
match req match req
.uri() .uri()
.path() .path()
.trim_right_matches("/") .trim_end_matches("/")
.rsplit("/") .rsplit("/")
.next() .next()
.unwrap() .unwrap()
@ -553,7 +553,7 @@ where
match req match req
.uri() .uri()
.path() .path()
.trim_right_matches("/") .trim_end_matches("/")
.rsplit("/") .rsplit("/")
.next() .next()
.unwrap() .unwrap()
@ -684,7 +684,7 @@ where
match req match req
.uri() .uri()
.path() .path()
.trim_right_matches("/") .trim_end_matches("/")
.rsplit("/") .rsplit("/")
.next() .next()
.unwrap() .unwrap()