Merge remote-tracking branch 'origin/master' into gen

2017-08-07 22:30:39 -07:00
parent cc4ff8f4d1 c5e2051f07
commit c25ddf21f1
280 changed files with 17756 additions and 2240 deletions
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -1041,6 +1041,7 @@ impl<'a> State<'a> {
                    where_clause: ast::WhereClause {
                        id: ast::DUMMY_NODE_ID,
                        predicates: Vec::new(),
+                        span: syntax_pos::DUMMY_SP,
                    },
                    span: syntax_pos::DUMMY_SP,
                };
@@ -2993,6 +2994,7 @@ impl<'a> State<'a> {
            where_clause: ast::WhereClause {
                id: ast::DUMMY_NODE_ID,
                predicates: Vec::new(),
+                span: syntax_pos::DUMMY_SP,
            },
            span: syntax_pos::DUMMY_SP,
        };