Auto merge of #16824 - Wilfred:size_whitespace, r=lnicola
minor: Fix unwanted leading whitespace in hover text
PR #16366 moved layout information to a separate line, so the leading whitespace is no longer necessary.
diff --git a/crates/ide/src/hover/render.rs b/crates/ide/src/hover/render.rs
index d1d0395..63777d4 100644
--- a/crates/ide/src/hover/render.rs
+++ b/crates/ide/src/hover/render.rs
@@ -510,7 +510,7 @@
let mut needs_impl_header = true;
for (trait_, assoc_types) in notable_traits {
desc.push_str(if mem::take(&mut needs_impl_header) {
- " // Implements notable traits: "
+ "// Implements notable traits: "
} else {
", "
});
@@ -661,7 +661,7 @@
if let Some(layout) =
render_memory_layout(config.memory_layout, || original.layout(sema.db), |_| None, |_| None)
{
- format_to!(markup, "{layout}");
+ format_to!(markup, " {layout}");
}
if let Some(trait_) = c.fn_trait(sema.db).get_id(sema.db, original.krate(sema.db).into()) {
push_new_def(hir::Trait::from(trait_).into())
@@ -730,7 +730,7 @@
let config = config?;
let layout = layout().ok()?;
- let mut label = String::from(" // ");
+ let mut label = String::from("// ");
if let Some(render) = config.size {
let size = match tag(&layout) {
diff --git a/crates/ide/src/hover/tests.rs b/crates/ide/src/hover/tests.rs
index c3cd651..051a962 100644
--- a/crates/ide/src/hover/tests.rs
+++ b/crates/ide/src/hover/tests.rs
@@ -180,7 +180,7 @@
*local*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
let local: i32
```
"#]],
@@ -471,7 +471,7 @@
*iter*
```rust
- // size = 8, align = 4
+ // size = 8, align = 4
let mut iter: Iter<Scan<OtherStruct<OtherStruct<i32>>, impl Fn(&mut u32, &u32, &mut u32) -> Option<u32>, u32>>
```
"#]],
@@ -713,7 +713,7 @@
```
```rust
- // size = 1, align = 1, offset = 6
+ // size = 1, align = 1, offset = 6
field_a: u8
```
"#]],
@@ -739,7 +739,7 @@
```
```rust
- // size = 4, align = 4, offset = 0
+ // size = 4, align = 4, offset = 0
pub field_a: u32
```
"#]],
@@ -762,7 +762,7 @@
```
```rust
- // size = 4, align = 4, offset = 0
+ // size = 4, align = 4, offset = 0
pub field_a: u32
```
"#]],
@@ -787,7 +787,7 @@
```
```rust
- // size = 4, align = 4, offset = 0
+ // size = 4, align = 4, offset = 0
pub 0: u32
```
"#]],
@@ -808,7 +808,7 @@
```
```rust
- // size = 4, align = 4, offset = 0
+ // size = 4, align = 4, offset = 0
pub 0: u32
```
"#]],
@@ -829,7 +829,7 @@
```
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
struct Foo(pub u32);
```
"#]],
@@ -957,7 +957,7 @@
*zz*
```rust
- // size = 8, align = 4
+ // size = 8, align = 4
let zz: Test<i32>
```
"#]],
@@ -1009,7 +1009,7 @@
*bar*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
let bar: Option<i32>
```
"#]],
@@ -1079,7 +1079,7 @@
*foo*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
foo: i32
```
"#]],
@@ -1094,7 +1094,7 @@
*foo*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
foo: i32
```
"#]],
@@ -1109,7 +1109,7 @@
*foo*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
foo: i32
```
"#]],
@@ -1124,7 +1124,7 @@
*foo*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
foo: i32
```
"#]],
@@ -1169,7 +1169,7 @@
*foo_test*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
let foo_test: Thing
```
"#]],
@@ -1374,7 +1374,7 @@
*x*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
let x: i32
```
"#]],
@@ -1505,7 +1505,7 @@
*bar*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
bar: u32
```
"#]],
@@ -1524,7 +1524,7 @@
*bar*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
bar: u32
```
"#]],
@@ -1760,7 +1760,7 @@
```
```rust
- // size = 8, align = 8, niches = 1
+ // size = 8, align = 8, niches = 1
type foo = fn(a: i32, b: i32) -> i32
```
"#]],
@@ -1779,7 +1779,7 @@
```
```rust
- // size = 8, align = 8, niches = 1
+ // size = 8, align = 8, niches = 1
type foo = fn(i32, i32) -> i32
```
"#]],
@@ -1926,7 +1926,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
struct Bar
```
@@ -1963,7 +1963,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
struct Bar
```
@@ -1993,7 +1993,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
struct Bar
```
@@ -2022,7 +2022,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
pub struct Bar
```
@@ -2050,7 +2050,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
pub struct Bar
```
@@ -2140,7 +2140,7 @@
```
```rust
- // size = 4, align = 2
+ // size = 4, align = 2
Variant1(u8, u16)
```
"#]],
@@ -2162,7 +2162,7 @@
```
```rust
- // size = 16 (0x10), align = 8, niches = 254
+ // size = 16 (0x10), align = 8, niches = 254
enum Foo {
Variant1(u8, u16),
Variant2(i32, u8, i64),
@@ -3466,7 +3466,7 @@
*f*
```rust
- // size = 8, align = 8, niches = 1
+ // size = 8, align = 8, niches = 1
let f: &i32
```
---
@@ -3476,7 +3476,7 @@
```
```rust
- // size = 4, align = 4, offset = 0
+ // size = 4, align = 4, offset = 0
f: i32
```
"#]],
@@ -3561,7 +3561,7 @@
*value*
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
let value: Const<1>
```
"#]],
@@ -3582,7 +3582,7 @@
*value*
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
let value: Const<0>
```
"#]],
@@ -3603,7 +3603,7 @@
*value*
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
let value: Const<-1>
```
"#]],
@@ -3624,7 +3624,7 @@
*value*
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
let value: Const<true>
```
"#]],
@@ -3645,7 +3645,7 @@
*value*
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
let value: Const<'🦀'>
```
"#]],
@@ -3665,7 +3665,7 @@
*self*
```rust
- // size = 8, align = 8, niches = 1
+ // size = 8, align = 8, niches = 1
self: &Foo
```
"#]],
@@ -3686,7 +3686,7 @@
*self*
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
self: Arc<Foo>
```
"#]],
@@ -4072,7 +4072,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
type Foo2 = Foo<2>
```
"#]],
@@ -4115,7 +4115,7 @@
```
```rust
- // size = 1, align = 1
+ // size = 1, align = 1
A = 8
```
@@ -4141,7 +4141,7 @@
```
```rust
- // size = 1, align = 1
+ // size = 1, align = 1
A = 12 (0xC)
```
@@ -4168,7 +4168,7 @@
```
```rust
- // size = 1, align = 1
+ // size = 1, align = 1
B = 2
```
@@ -4195,7 +4195,7 @@
```
```rust
- // size = 1, align = 1
+ // size = 1, align = 1
B = 5
```
@@ -5002,7 +5002,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
A = 3
```
@@ -5025,7 +5025,7 @@
*tile4*
```rust
- // size = 32 (0x20), align = 4
+ // size = 32 (0x20), align = 4
let tile4: [u32; 8]
```
"#]],
@@ -5262,7 +5262,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
pub struct TheItem
```
@@ -5411,7 +5411,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
struct String
```
@@ -6139,7 +6139,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
pub struct Foo
```
@@ -6165,7 +6165,7 @@
```
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
pub struct Foo(i32);
```
@@ -6290,7 +6290,7 @@
```
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
RecordV { field: u32 }
```
"#]],
@@ -6313,7 +6313,7 @@
```
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
field: u32
```
"#]],
@@ -6961,7 +6961,7 @@
```
```rust
- // size = 4, align = 4, offset = 0
+ // size = 4, align = 4, offset = 0
f: u32
```
"#]],
@@ -6981,7 +6981,7 @@
*s*
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
let s: S
```
"#]],
@@ -7002,7 +7002,7 @@
*foo*
```rust
- // size = 4, align = 4
+ // size = 4, align = 4
let foo: i32
```
"#]],
@@ -7023,7 +7023,7 @@
*aaaaa*
```rust
- // size = 16 (0x10), align = 8, niches = 1
+ // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str
```
"#]],
@@ -7044,7 +7044,7 @@
*aaaaa*
```rust
- // size = 16 (0x10), align = 8, niches = 1
+ // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str
```
"#]],
@@ -7065,7 +7065,7 @@
*aaaaa*
```rust
- // size = 16 (0x10), align = 8, niches = 1
+ // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str
```
"#]],
@@ -7091,7 +7091,7 @@
*aaaaa*
```rust
- // size = 16 (0x10), align = 8, niches = 1
+ // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str
```
"#]],
@@ -7440,8 +7440,8 @@
*notable*
```rust
- // Implements notable traits: Notable<Assoc = &str, Assoc2 = char>
- // size = 4, align = 4
+ // Implements notable traits: Notable<Assoc = &str, Assoc2 = char>
+ // size = 4, align = 4
notable: u32
```
"#]],
@@ -7472,8 +7472,8 @@
```
```rust
- // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>
- // size = 0, align = 1
+ // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>
+ // size = 0, align = 1
struct S
```
"#]],
@@ -7532,7 +7532,7 @@
```
```rust
- // size = 0, align = 1
+ // size = 0, align = 1
type Ty
```
"#]],
@@ -7560,7 +7560,7 @@
"#,
expect![[r#"
```rust
- // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>
+ // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>
S
```"#]],
);
