Skip to content

Use double reference in debug derive #14788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ impl < > core::fmt::Debug for Command< > where {
Command::Move {
x: x, y: y,
}
=>f.debug_struct("Move").field("x", x).field("y", y).finish(), Command::Do(f0, )=>f.debug_tuple("Do").field(f0).finish(), Command::Jump=>f.write_str("Jump"),
=>f.debug_struct("Move").field("x", &x).field("y", &y).finish(), Command::Do(f0, )=>f.debug_tuple("Do").field(&f0).finish(), Command::Jump=>f.write_str("Jump"),
}
}
}"#]],
Expand Down
4 changes: 2 additions & 2 deletions crates/hir-expand/src/builtin_derive_macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ fn debug_expand(
let for_fields = fields.iter().map(|x| {
let x_string = x.to_string();
quote! {
.field(#x_string, #x)
.field(#x_string, & #x)
}
});
quote! {
Expand All @@ -529,7 +529,7 @@ fn debug_expand(
VariantShape::Tuple(n) => {
let for_fields = tuple_field_iterator(*n).map(|x| {
quote! {
.field(#x)
.field( & #x)
}
});
quote! {
Expand Down
20 changes: 20 additions & 0 deletions crates/ide-diagnostics/src/handlers/type_mismatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,26 @@ fn f() {
//^ error: expected (), found i32
}
}
"#,
);
}

#[test]
fn regression_14768() {
check_diagnostics(
r#"
//- minicore: derive, fmt, slice, coerce_unsized, builtin_impls
use core::fmt::Debug;

#[derive(Debug)]
struct Foo(u8, u16, [u8]);

#[derive(Debug)]
struct Bar {
f1: u8,
f2: &[u16],
f3: dyn Debug,
}
"#,
);
}
Expand Down
73 changes: 68 additions & 5 deletions crates/test-utils/src/minicore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,38 @@ pub mod fmt {
pub struct Error;
pub type Result = Result<(), Error>;
pub struct Formatter<'a>;
pub struct DebugTuple;
pub struct DebugStruct;
impl Formatter<'_> {
pub fn debug_tuple(&mut self, name: &str) -> DebugTuple {
DebugTuple
}

pub fn debug_struct(&mut self, name: &str) -> DebugStruct {
DebugStruct
}
}

impl DebugTuple {
pub fn field(&mut self, value: &dyn Debug) -> &mut Self {
self
}

pub fn finish(&mut self) -> Result {
Ok(())
}
}

impl DebugStruct {
pub fn field(&mut self, name: &str, value: &dyn Debug) -> &mut Self {
self
}

pub fn finish(&mut self) -> Result {
Ok(())
}
}

pub trait Debug {
fn fmt(&self, f: &mut Formatter<'_>) -> Result;
}
Expand All @@ -777,6 +809,39 @@ pub mod fmt {
#[rustc_builtin_macro]
pub macro Debug($item:item) {}
// endregion:derive

// region:builtin_impls
macro_rules! impl_debug {
($($t:ty)*) => {
$(
impl const Debug for $t {
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
Ok(())
}
}
)*
}
}

impl_debug! {
usize u8 u16 u32 u64 u128
isize i8 i16 i32 i64 i128
f32 f64
bool char
}

impl<T: Debug> Debug for [T] {
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
Ok(())
}
}

impl<T: Debug + ?Sized> Debug for &T {
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
(&**self).fmt(f)
}
}
// endregion:builtin_impls
}
// endregion:fmt

Expand Down Expand Up @@ -1075,10 +1140,8 @@ pub mod iter {

// region:panic
mod panic {
pub macro panic_2021 {
($($t:tt)+) => (
/* Nothing yet */
),
pub macro panic_2021($($t:tt)+) {
/* Nothing yet */
}
}
// endregion:panic
Expand Down Expand Up @@ -1158,8 +1221,8 @@ pub mod prelude {
ops::Drop, // :drop
ops::{Fn, FnMut, FnOnce}, // :fn
option::Option::{self, None, Some}, // :option
result::Result::{self, Err, Ok}, // :result
panic, // :panic
result::Result::{self, Err, Ok}, // :result
};
}

Expand Down