Upgrade to rustc 1.23.0-nightly (33374fa9d 2017-11-20)

Author: SimonSapin

Cargo.toml

@@ -32,6 +32,7 @@ smallvec = "0.4.3"
 [build-dependencies]
 syn = "0.11"
 quote = "0.3"
+rustc_version = "0.2"
 
 [features]
 bench = []

build.rs

@@ -4,6 +4,7 @@
 
 extern crate quote;
 extern crate syn;
+extern crate rustc_version;
 
 use std::env;
 use std::path::Path;
@@ -33,6 +34,18 @@ mod codegen {
 }
 
 fn main() {
+    let rustc = rustc_version::version_meta().unwrap();
+    let commit_date = match rustc.commit_date {
+        Some(ref s) => &**s,
+        None => "unknown",  // Sorts after a date
+    };
+    if (rustc.semver.major, rustc.semver.minor, rustc.semver.patch, commit_date) >=
+       (1, 23, 0, "2017-11-20")
+    {
+        // https://github.com/rust-lang/rust/pull/45225
+        println!("cargo:rustc-cfg=rustc_has_pr45225")
+    }
+
     let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let tokenizer_rs = Path::new(&manifest_dir).join("src/tokenizer.rs");
     codegen::main(&tokenizer_rs);

src/size_of_tests.rs

@@ -37,10 +37,10 @@ size_of_test!(std_cow_str, Cow<'static, str>, 32);
 size_of_test!(cow_rc_str, CowRcStr, 16);
 
 size_of_test!(tokenizer, ::tokenizer::Tokenizer, 72);
-size_of_test!(parser_input, ::parser::ParserInput, 144);
+size_of_test!(parser_input, ::parser::ParserInput, if cfg!(rustc_has_pr45225) { 136 } else { 144 });
 size_of_test!(parser, ::parser::Parser, 16);
 size_of_test!(source_position, ::SourcePosition, 8);
 size_of_test!(parser_state, ::ParserState, 24);
 
 size_of_test!(basic_parse_error, ::BasicParseError, 48);
-size_of_test!(parse_error_lower_bound, ::ParseError<()>, 56);
+size_of_test!(parse_error_lower_bound, ::ParseError<()>, if cfg!(rustc_has_pr45225) { 48 } else { 56 });