berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

remove dead code

This commit is contained in:
François Mockers 2018-11-06 01:13:27 +01:00 committed by François Mockers
parent 40c1547de6
commit fa6477012d
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/uri.rs
View File

@ -1,31 +1,12 @@
use http::Uri; use http::Uri;
use std::rc::Rc; use std::rc::Rc;
#[allow(dead_code)]
const GEN_DELIMS: &[u8] = b":/?#[]@";
#[allow(dead_code)]
const SUB_DELIMS_WITHOUT_QS: &[u8] = b"!$'()*,";
#[allow(dead_code)]
const SUB_DELIMS: &[u8] = b"!$'()*,+?=;";
// https://tools.ietf.org/html/rfc3986#section-2.2 // https://tools.ietf.org/html/rfc3986#section-2.2
#[allow(dead_code)]
const RESERVED: &[u8] = b":/?#[]@!$&'()*,+?;=";
#[allow(dead_code)]
const RESERVED_PLUS_EXTRA: &[u8] = b":/?#[]@!$&'()*,+?;=%^ <>\"\\`{}|"; const RESERVED_PLUS_EXTRA: &[u8] = b":/?#[]@!$&'()*,+?;=%^ <>\"\\`{}|";
// https://tools.ietf.org/html/rfc3986#section-2.3 // https://tools.ietf.org/html/rfc3986#section-2.3
#[allow(dead_code)]
const UNRESERVED: &[u8] = const UNRESERVED: &[u8] =
b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-._~"; b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-._~";
#[allow(dead_code)]
const ALLOWED: &[u8] = b"abcdefghijklmnopqrstuvwxyz
ABCDEFGHIJKLMNOPQRSTUVWXYZ
1234567890
-._~
!$'()*,";
#[allow(dead_code)]
const QS: &[u8] = b"+&=;b";
#[inline] #[inline]
fn bit_at(array: &[u8], ch: u8) -> bool { fn bit_at(array: &[u8], ch: u8) -> bool {
@ -38,8 +19,8 @@ fn set_bit(array: &mut [u8], ch: u8) {
} }
lazy_static! { lazy_static! {
static ref UNRESERVED_QUOTER: Quoter = { Quoter::new(UNRESERVED, b"") }; static ref UNRESERVED_QUOTER: Quoter = { Quoter::new(UNRESERVED) };
pub(crate) static ref RESERVED_QUOTER: Quoter = { Quoter::new(RESERVED_PLUS_EXTRA, b"") }; pub(crate) static ref RESERVED_QUOTER: Quoter = { Quoter::new(RESERVED_PLUS_EXTRA) };
} }
#[derive(Default, Clone, Debug)] #[derive(Default, Clone, Debug)]
@ -70,14 +51,12 @@ impl Url {
pub(crate) struct Quoter { pub(crate) struct Quoter {
safe_table: [u8; 16], safe_table: [u8; 16],
protected_table: [u8; 16],
} }
impl Quoter { impl Quoter {
pub fn new(safe: &[u8], protected: &[u8]) -> Quoter { pub fn new(safe: &[u8]) -> Quoter {
let mut q = Quoter { let mut q = Quoter {
safe_table: [0; 16], safe_table: [0; 16],
protected_table: [0; 16],
}; };
// prepare safe table // prepare safe table
@ -85,12 +64,6 @@ impl Quoter {
set_bit(&mut q.safe_table, *ch) set_bit(&mut q.safe_table, *ch)
} }
// prepare protected table
for ch in protected {
set_bit(&mut q.safe_table, *ch);
set_bit(&mut q.protected_table, *ch);
}
q q
} }
@ -113,12 +86,6 @@ impl Quoter {
if let Some(ch) = restore_ch(pct[1], pct[2]) { if let Some(ch) = restore_ch(pct[1], pct[2]) {
if ch < 128 { if ch < 128 {
if bit_at(&self.protected_table, ch) {
buf.extend_from_slice(&pct);
idx += 1;
continue;
}
if bit_at(&self.safe_table, ch) { if bit_at(&self.safe_table, ch) {
buf.push(ch); buf.push(ch);
idx += 1; idx += 1;