rust: Fix peg-syntax-ext for filemap API change

kevinmehall · kevinmehall · commit de96c1810718 · 2017-04-28T22:52:23.000-07:00
rust-lang/rust#41508
diff --git a/peg-syntax-ext/lib.rs b/peg-syntax-ext/lib.rs
@@ -1,7 +1,6 @@
 #![feature(plugin_registrar, quote, rustc_private, box_patterns)]
 extern crate rustc_plugin;
 #[macro_use] pub extern crate syntax;
-#[macro_use] extern crate syntax_pos;
 extern crate rustc_errors as errors;
 
 extern crate peg;
@@ -54,7 +53,7 @@ fn expand_peg_file<'s>(cx: &'s mut ExtCtxt, sp: codemap::Span, ident: ast::Ident
         return DummyResult::any(sp);
     }
 
-    cx.codemap().new_filemap(format!("{}", path.display()), None, "".to_string());
+    cx.codemap().new_filemap(format!("{}", path.display()), "".to_string());
 
     expand_peg(cx, sp, ident, &source)
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#![feature(plugin_registrar, quote, rustc_private, box_patterns)]`
`2`	`2`	`extern crate rustc_plugin;`
`3`	`3`	`#[macro_use] pub extern crate syntax;`
`4`		`-#[macro_use] extern crate syntax_pos;`
`5`	`4`	`extern crate rustc_errors as errors;`
`6`	`5`
`7`	`6`	`extern crate peg;`
`@@ -54,7 +53,7 @@ fn expand_peg_file<'s>(cx: &'s mut ExtCtxt, sp: codemap::Span, ident: ast::Ident`
`54`	`53`	`return DummyResult::any(sp);`
`55`	`54`	`}`
`56`	`55`
`57`		`- cx.codemap().new_filemap(format!("{}", path.display()), None, "".to_string());`
	`56`	`+ cx.codemap().new_filemap(format!("{}", path.display()), "".to_string());`
`58`	`57`
`59`	`58`	`expand_peg(cx, sp, ident, &source)`
`60`	`59`	`}`