bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fully integrate token collection for additional AST structs

Browse source 
This commit contains miscellaneous changes that don't fit into any of
the other commits in this PR
This commit is contained in:
Aaron Hill 2020-08-21 22:11:41 -04:00
parent 156ef2bee8
commit fec0479075
No known key found for this signature in database
GPG key ID: B4087E510E98B164
11 changed files with 338 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_ast/src/token.rs
View file

@ -700,7 +700,7 @@ pub enum Nonterminal {
// `Nonterminal` is used a lot. Make sure it doesn't unintentionally get bigger.
#[cfg(target_arch = "x86_64")]
rustc_data_structures::static_assert_size!(Nonterminal, 40);
rustc_data_structures::static_assert_size!(Nonterminal, 48);
#[derive(Debug, Copy, Clone, PartialEq, Encodable, Decodable)]
pub enum NonterminalKind {

7
compiler/rustc_ast_pretty/src/pprust/tests.rs
View file

@ -1,7 +1,6 @@
use super::*;
use rustc_ast as ast;
use rustc_span::source_map::respan;
use rustc_span::symbol::Ident;
use rustc_span::with_default_session_globals;
@ -45,7 +44,11 @@ fn test_variant_to_string() {
let var = ast::Variant {
ident,
vis: respan(rustc_span::DUMMY_SP, ast::VisibilityKind::Inherited),
vis: ast::Visibility {
span: rustc_span::DUMMY_SP,
kind: ast::VisibilityKind::Inherited,
tokens: None,
},
attrs: Vec::new(),
id: ast::DUMMY_NODE_ID,
data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),