actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-28 09:42:40 +01:00
Code Issues Releases Wiki Activity

clippy warnings

Browse Source
This commit is contained in:
Nikolay Kim 2018-09-11 11:25:32 -07:00
parent 70a3f317d3
commit c3f8b5cf22
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/router.rs
View File

@ -832,7 +832,7 @@ impl ResourceDef {
}).expect("malformed param"); }).expect("malformed param");
let (mut param, rem) = pattern.split_at(close_idx + 1); let (mut param, rem) = pattern.split_at(close_idx + 1);
param = &param[1..param.len() - 1]; // Remove outer brackets param = &param[1..param.len() - 1]; // Remove outer brackets
let (name, pattern) = match param.find(":") { let (name, pattern) = match param.find(':') {
Some(idx) => { Some(idx) => {
let (name, pattern) = param.split_at(idx); let (name, pattern) = param.split_at(idx);
(name, &pattern[1..]) (name, &pattern[1..])
@ -849,7 +849,7 @@ impl ResourceDef {
fn parse( fn parse(
mut pattern: &str, for_prefix: bool, mut pattern: &str, for_prefix: bool,
) -> (String, Vec<PatternElement>, bool, usize) { ) -> (String, Vec<PatternElement>, bool, usize) {
if pattern.find("{").is_none() { if pattern.find('{').is_none() {
return ( return (
String::from(pattern), String::from(pattern),
vec![PatternElement::Str(String::from(pattern))], vec![PatternElement::Str(String::from(pattern))],
@ -861,7 +861,7 @@ impl ResourceDef {
let mut elems = Vec::new(); let mut elems = Vec::new();
let mut re = String::from("^"); let mut re = String::from("^");
while let Some(idx) = pattern.find("{") { while let Some(idx) = pattern.find('{') {
let (prefix, rem) = pattern.split_at(idx); let (prefix, rem) = pattern.split_at(idx);
elems.push(PatternElement::Str(String::from(prefix))); elems.push(PatternElement::Str(String::from(prefix)));
re.push_str(&escape(prefix)); re.push_str(&escape(prefix));

6
src/server/http.rs
View File

@ -3,7 +3,7 @@ use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
use std::{io, mem, net, time}; use std::{io, mem, net, time};
use actix::{Arbiter, Actor, Addr, AsyncContext, Context, Handler, System}; use actix::{Actor, Addr, Arbiter, AsyncContext, Context, Handler, System};
use futures::{Future, Stream}; use futures::{Future, Stream};
use net2::{TcpBuilder, TcpStreamExt}; use net2::{TcpBuilder, TcpStreamExt};
@ -636,7 +636,9 @@ where
fn shutdown(&self, force: bool) { fn shutdown(&self, force: bool) {
if force { if force {
self.settings.head().traverse(|ch: &mut HttpChannel<TcpStream, H>| ch.shutdown()); self.settings
.head()
.traverse(|ch: &mut HttpChannel<TcpStream, H>| ch.shutdown());
} }
} }
} }