New upstream version 1.31.0~beta.4+dfsg1

[rustc.git] / src / libfmt_macros / lib.rs

diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs
index 3720100700c9c2768249fae7fa488c62e39f78b0..7d87c1839d78c7059e9fe49d8dacb404964d2efe 100644 (file)
--- a/src/libfmt_macros/lib.rs
+++ b/src/libfmt_macros/lib.rs
@@ -20,8 +20,7 @@
        html_playground_url = "https://play.rust-lang.org/",
        test(attr(deny(warnings))))]
 
-#![cfg_attr(not(stage0), feature(nll))]
-#![cfg_attr(not(stage0), feature(infer_outlives_requirements))]
+#![feature(nll)]
 
 pub use self::Piece::*;
 pub use self::Position::*;
@@ -289,7 +288,7 @@ impl<'a> Parser<'a> {
                 self.cur.next();
                 Some(pos)
             } else {
-                let pos = pos + padding + 1;
+                let pos = pos + raw + 1;
                 self.err(format!("expected `{:?}`, found `{:?}`", c, maybe),
                          format!("expected `{}`", c),
                          pos,