aff1be2637
The pretty-printers open and close "boxes" of text a lot. The open and close operations must be matched. The matching is currently all implicit and very easy to get wrong. (#140280 and #140246 are two recent pretty-printing fixes that both involved unclosed boxes.) This commit introduces `BoxMarker`, a marker type that represents an open box. It makes box opening/closing explicit, which makes it much easier to understand and harder to get wrong. The commit also removes many comments are on `end` calls saying things like "end outer head-block", "Close the outer-box". These demonstrate how confusing the implicit approach was, but aren't necessary any more.
62 lines
1.6 KiB
Rust
62 lines
1.6 KiB
Rust
use rustc_ast as ast;
|
|
use rustc_span::{DUMMY_SP, Ident, create_default_session_globals_then};
|
|
use thin_vec::ThinVec;
|
|
|
|
use super::*;
|
|
|
|
fn fun_to_string(
|
|
decl: &ast::FnDecl,
|
|
header: ast::FnHeader,
|
|
ident: Ident,
|
|
generics: &ast::Generics,
|
|
) -> String {
|
|
to_string(|s| {
|
|
let (cb, ib) = s.head("");
|
|
s.print_fn(decl, header, Some(ident), generics);
|
|
s.end(ib);
|
|
s.end(cb);
|
|
})
|
|
}
|
|
|
|
fn variant_to_string(var: &ast::Variant) -> String {
|
|
to_string(|s| s.print_variant(var))
|
|
}
|
|
|
|
#[test]
|
|
fn test_fun_to_string() {
|
|
create_default_session_globals_then(|| {
|
|
let abba_ident = Ident::from_str("abba");
|
|
|
|
let decl = ast::FnDecl { inputs: ThinVec::new(), output: ast::FnRetTy::Default(DUMMY_SP) };
|
|
let generics = ast::Generics::default();
|
|
assert_eq!(
|
|
fun_to_string(&decl, ast::FnHeader::default(), abba_ident, &generics),
|
|
"fn abba()"
|
|
);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn test_variant_to_string() {
|
|
create_default_session_globals_then(|| {
|
|
let ident = Ident::from_str("principal_skinner");
|
|
|
|
let var = ast::Variant {
|
|
ident,
|
|
vis: ast::Visibility {
|
|
span: DUMMY_SP,
|
|
kind: ast::VisibilityKind::Inherited,
|
|
tokens: None,
|
|
},
|
|
attrs: ast::AttrVec::new(),
|
|
id: ast::DUMMY_NODE_ID,
|
|
data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),
|
|
disr_expr: None,
|
|
span: DUMMY_SP,
|
|
is_placeholder: false,
|
|
};
|
|
|
|
let varstr = variant_to_string(&var);
|
|
assert_eq!(varstr, "principal_skinner");
|
|
})
|
|
}
|