bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix spacing of pretty printed const item without body

Browse source
This commit is contained in:
David Tolnay 2021-12-29 11:35:50 -08:00
parent 2b67c30bfe
commit b7df49895c
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
5 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_ast_pretty/src/pprust/state.rs
View file

@ -1116,9 +1116,9 @@ impl<'a> State<'a> {
self.print_ident(ident); self.print_ident(ident);
self.word_space(":"); self.word_space(":");
self.print_type(ty); self.print_type(ty);
self.space();
self.end(); // end the head-ibox self.end(); // end the head-ibox
if let Some(body) = body { if let Some(body) = body {
self.space();
self.word_space("="); self.word_space("=");
self.print_expr(body); self.print_expr(body);
} }

3
src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs
View file

@ -7,7 +7,8 @@ struct C {
} }
#[allow()] #[allow()]
const C: C = const C: C
=
C{ C{
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
field: 0, field: 0,

20
src/test/pretty/nested-item-vis-defaultness.rs
View file

@ -6,42 +6,42 @@ fn main() {}
#[cfg(FALSE)] #[cfg(FALSE)]
extern "C" { extern "C" {
static X: u8 ; static X: u8;
type X; type X;
fn foo(); fn foo();
pub static X: u8 ; pub static X: u8;
pub type X; pub type X;
pub fn foo(); pub fn foo();
} }
#[cfg(FALSE)] #[cfg(FALSE)]
trait T { trait T {
const X: u8 ; const X: u8;
type X; type X;
fn foo(); fn foo();
default const X: u8 ; default const X: u8;
default type X; default type X;
default fn foo(); default fn foo();
pub const X: u8 ; pub const X: u8;
pub type X; pub type X;
pub fn foo(); pub fn foo();
pub default const X: u8 ; pub default const X: u8;
pub default type X; pub default type X;
pub default fn foo(); pub default fn foo();
} }
#[cfg(FALSE)] #[cfg(FALSE)]
impl T for S { impl T for S {
const X: u8 ; const X: u8;
type X; type X;
fn foo(); fn foo();
default const X: u8 ; default const X: u8;
default type X; default type X;
default fn foo(); default fn foo();
pub const X: u8 ; pub const X: u8;
pub type X; pub type X;
pub fn foo(); pub fn foo();
pub default const X: u8 ; pub default const X: u8;
pub default type X; pub default type X;
pub default fn foo(); pub default fn foo();
} }

6
src/test/ui/macros/stringify.rs
View file

@ -382,13 +382,13 @@ fn test_item() {
stringify_item!( stringify_item!(
static S: (); static S: ();
), ),
"static S: () ;", // FIXME "static S: ();",
); );
assert_eq!( assert_eq!(
stringify_item!( stringify_item!(
static mut S: (); static mut S: ();
), ),
"static mut S: () ;", "static mut S: ();",
); );
// ItemKind::Const // ItemKind::Const
@ -402,7 +402,7 @@ fn test_item() {
stringify_item!( stringify_item!(
const S: (); const S: ();
), ),
"const S: () ;", // FIXME "const S: ();",
); );
// ItemKind::Fn // ItemKind::Fn

3
src/test/ui/proc-macro/quote-debug.stdout
View file

@ -43,7 +43,8 @@ fn main() {
crate::TokenStream::from(crate::TokenTree::Punct(crate::Punct::new('\u{3b}', crate::TokenStream::from(crate::TokenTree::Punct(crate::Punct::new('\u{3b}',
crate::Spacing::Alone)))].iter().cloned().collect::<crate::TokenStream>() crate::Spacing::Alone)))].iter().cloned().collect::<crate::TokenStream>()
} }
const _: () = const _: ()
=
{ {
extern crate proc_macro; extern crate proc_macro;
#[rustc_proc_macro_decls] #[rustc_proc_macro_decls]