mirror of https://github.com/rwf2/Rocket.git
Update from 'ordermap' to 'indexmap' 0.4.
This commit is contained in:
parent
794dc66e3b
commit
c3b6c542e8
|
@ -16,7 +16,7 @@ plugin = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rocket = { version = "0.4.0-dev", path = "../lib/" }
|
rocket = { version = "0.4.0-dev", path = "../lib/" }
|
||||||
ordermap = "0.3"
|
indexmap = "0.4"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
|
|
@ -230,7 +230,7 @@ extern crate syntax_ext;
|
||||||
extern crate syntax_pos;
|
extern crate syntax_pos;
|
||||||
extern crate rustc_plugin;
|
extern crate rustc_plugin;
|
||||||
extern crate rocket;
|
extern crate rocket;
|
||||||
extern crate ordermap;
|
extern crate indexmap;
|
||||||
|
|
||||||
#[macro_use] mod utils;
|
#[macro_use] mod utils;
|
||||||
mod parser;
|
mod parser;
|
||||||
|
|
|
@ -11,7 +11,7 @@ use syntax::parse::parser::{Parser, PathStyle};
|
||||||
use syntax::print::pprust::ty_to_string;
|
use syntax::print::pprust::ty_to_string;
|
||||||
use syntax::ptr::P;
|
use syntax::ptr::P;
|
||||||
|
|
||||||
use ordermap::OrderMap;
|
use indexmap::IndexMap;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
enum Arg {
|
enum Arg {
|
||||||
|
@ -224,7 +224,7 @@ impl InternalUriParams {
|
||||||
None => unnamed(&vec![]),
|
None => unnamed(&vec![]),
|
||||||
Some(Spanned { node: Args::Unnamed(ref args), .. }) => unnamed(args),
|
Some(Spanned { node: Args::Unnamed(ref args), .. }) => unnamed(args),
|
||||||
Some(Spanned { node: Args::Named(ref args), .. }) => {
|
Some(Spanned { node: Args::Named(ref args), .. }) => {
|
||||||
let mut params: OrderMap<Name, Option<P<Expr>>> = self.fn_args.iter()
|
let mut params: IndexMap<Name, Option<P<Expr>>> = self.fn_args.iter()
|
||||||
.map(|&(ident, _)| (ident.node.name, None))
|
.map(|&(ident, _)| (ident.node.name, None))
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ pear_codegen = "0.0.13"
|
||||||
rustls = { version = "0.12.0", optional = true }
|
rustls = { version = "0.12.0", optional = true }
|
||||||
hyper = { version = "0.10.13", default-features = false }
|
hyper = { version = "0.10.13", default-features = false }
|
||||||
hyper-sync-rustls = { version = "=0.3.0-rc.2", features = ["server"], optional = true }
|
hyper-sync-rustls = { version = "=0.3.0-rc.2", features = ["server"], optional = true }
|
||||||
ordermap = "0.3"
|
indexmap = "0.4"
|
||||||
isatty = "0.1"
|
isatty = "0.1"
|
||||||
|
|
||||||
[dependencies.cookie]
|
[dependencies.cookie]
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
use std::borrow::{Borrow, Cow};
|
use std::borrow::{Borrow, Cow};
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
|
||||||
use ordermap::OrderMap;
|
use indexmap::IndexMap;
|
||||||
|
|
||||||
use http::uncased::{Uncased, UncasedStr};
|
use http::uncased::{Uncased, UncasedStr};
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ impl<'h> fmt::Display for Header<'h> {
|
||||||
/// returns values for headers of names "AbC", "ABC", "abc", and so on.
|
/// returns values for headers of names "AbC", "ABC", "abc", and so on.
|
||||||
#[derive(Clone, Debug, PartialEq, Default)]
|
#[derive(Clone, Debug, PartialEq, Default)]
|
||||||
pub struct HeaderMap<'h> {
|
pub struct HeaderMap<'h> {
|
||||||
headers: OrderMap<Uncased<'h>, Vec<Cow<'h, str>>>
|
headers: IndexMap<Uncased<'h>, Vec<Cow<'h, str>>>
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'h> HeaderMap<'h> {
|
impl<'h> HeaderMap<'h> {
|
||||||
|
@ -132,7 +132,7 @@ impl<'h> HeaderMap<'h> {
|
||||||
/// ```
|
/// ```
|
||||||
#[inline(always)]
|
#[inline(always)]
|
||||||
pub fn new() -> HeaderMap<'h> {
|
pub fn new() -> HeaderMap<'h> {
|
||||||
HeaderMap { headers: OrderMap::new() }
|
HeaderMap { headers: IndexMap::new() }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns true if `self` contains a header with the name `name`.
|
/// Returns true if `self` contains a header with the name `name`.
|
||||||
|
|
|
@ -112,7 +112,7 @@ extern crate time;
|
||||||
extern crate memchr;
|
extern crate memchr;
|
||||||
extern crate base64;
|
extern crate base64;
|
||||||
extern crate smallvec;
|
extern crate smallvec;
|
||||||
extern crate ordermap;
|
extern crate indexmap;
|
||||||
extern crate isatty;
|
extern crate isatty;
|
||||||
|
|
||||||
#[cfg(test)] #[macro_use] extern crate lazy_static;
|
#[cfg(test)] #[macro_use] extern crate lazy_static;
|
||||||
|
|
Loading…
Reference in New Issue