Skip to content

Commit 4c41ef0

Browse files
committed
Auto merge of #1612 - GrayJack:fix_utmpx_debug_solarish, r=gnzlbg
Solarish: Fix utmx Debug impl and re-add support for extra traits Fix a bug where the compilation failed cause `utmpx.host` is bigger than 32 so we cannot print it. Due to a break of compilation (only with extra trait enabled) on a Tier 2 platform, I do think it would be better to do another release as soon as proven fixing compilation
2 parents a3c5f9b + b135afc commit 4c41ef0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/unix/solarish/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,16 +479,19 @@ s_no_extra_traits! {
479479
__sigev_pad2: ::c_int,
480480
}
481481

482+
#[cfg_attr(feature = "extra_traits", allow(missing_debug_implementations))]
482483
pub union door_desc_t__d_data {
483484
pub d_desc: door_desc_t__d_data__d_desc,
484485
d_resv: [::c_int; 5], /* Check out /usr/include/sys/door.h */
485486
}
486487

488+
#[cfg_attr(feature = "extra_traits", allow(missing_debug_implementations))]
487489
pub struct door_desc_t {
488490
pub d_attributes: door_attr_t,
489491
pub d_data: door_desc_t__d_data,
490492
}
491493

494+
#[cfg_attr(feature = "extra_traits", allow(missing_debug_implementations))]
492495
pub struct door_arg_t {
493496
pub data_ptr: *const ::c_char,
494497
pub data_size: ::size_t,
@@ -536,7 +539,7 @@ cfg_if! {
536539
.field("ut_session", &self.ut_session)
537540
.field("ut_pad", &self.ut_pad)
538541
.field("ut_syslen", &self.ut_syslen)
539-
.field("ut_host", &self.ut_host)
542+
.field("ut_host", &&self.ut_host[..])
540543
.finish()
541544
}
542545
}

0 commit comments

Comments
 (0)