Update codegen and pear_codegen for 2017-12-17 nightly.

This commit is contained in:
Sergio Benitez 2017-12-18 06:50:27 -08:00
parent 5b85a05366
commit a9c66c9426
6 changed files with 7 additions and 7 deletions

View File

@ -8,7 +8,7 @@ use yansi::Color::{Red, Yellow, Blue, White};
use version_check::{supports_features, is_min_version, is_min_date};
// Specifies the minimum nightly version needed to compile Rocket's codegen.
const MIN_DATE: &'static str = "2017-12-14";
const MIN_DATE: &'static str = "2017-12-17";
const MIN_VERSION: &'static str = "1.24.0-nightly";
fn main() {

View File

@ -315,7 +315,7 @@ fn from_form_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substruct
Ok($self_ident { $result_fields })
});
stmts.extend(final_block.unwrap().stmts);
stmts.extend(final_block.into_inner().stmts);
debug!("Form statements:");
for stmt in &stmts {

View File

@ -45,7 +45,7 @@ where F: FnMut(&ExtCtxt, Path) -> P<Expr>
// Now put them all in one vector and return the thing.
let path_list = sep_by_tok(ecx, &path_exprs, Token::Comma);
let output = quote_expr!(ecx, vec![$path_list]).unwrap();
let output = quote_expr!(ecx, vec![$path_list]).into_inner();
MacEager::expr(P(output))
}
Err(mut e) => {

View File

@ -138,7 +138,7 @@ pub fn uri_internal(
// replace &expr with [let tmp = expr; &tmp] so that borrows of
// temporary expressions live at least as long as the call to
// `from_uri_param`. Otherwise, exprs like &S { .. } won't compile.
let cloned_expr = expr.clone().unwrap();
let cloned_expr = expr.clone().into_inner();
if let ast::ExprKind::AddrOf(_, inner) = cloned_expr.node {
// Only reassign temporary expressions, not locations.
if !inner.is_location() {

View File

@ -11,7 +11,7 @@ impl Function {
let inner = match *annotated {
Annotatable::Item(ref item) => match item.node {
ItemKind::Fn(ref decl, ..) => {
span((item.ident, decl.clone().unwrap()), item.span)
span((item.ident, decl.clone().into_inner()), item.span)
}
_ => return Err(item.span)
},

View File

@ -28,8 +28,8 @@ time = "0.1"
memchr = "1"
base64 = "0.7"
smallvec = "0.4"
pear = "0.0.11"
pear_codegen = "0.0.11"
pear = "0.0.12"
pear_codegen = "0.0.12"
rustls = { version = "0.11.0", optional = true }
hyper = { version = "0.10.13", default-features = false }
hyper-sync-rustls = { version = "0.3.0-rc.1", features = ["server"], optional = true }