Skip to content

Commit d650091

Browse files
committed
Make tidy happy
1 parent 2a9fa20 commit d650091

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,13 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
16871687
source_info: None,
16881688
}];
16891689

1690-
set_members_of_composite_type(cx, self.enum_type, variant_metadata, members, None);
1690+
set_members_of_composite_type(
1691+
cx,
1692+
self.enum_type,
1693+
variant_metadata,
1694+
members,
1695+
None,
1696+
);
16911697

16921698
let variant_info = variant_info_for(dataful_variant);
16931699
let (variant_type_metadata, member_desc_factory) = describe_enum_variant(
@@ -1932,9 +1938,9 @@ fn describe_enum_variant(
19321938
// We have the layout of an enum variant, we need the layout of the outer enum
19331939
let enum_layout = cx.layout_of(layout.ty);
19341940
let offset = enum_layout.fields.offset(tag_field.as_usize());
1935-
let tag_name = if cx.tcx.sess.target.is_like_msvc { "variant$" } else { "RUST$ENUM$DISR" };
1936-
let args =
1937-
(tag_name.to_owned(), enum_layout.field(cx, tag_field.as_usize()).ty);
1941+
let tag_name =
1942+
if cx.tcx.sess.target.is_like_msvc { "variant$" } else { "RUST$ENUM$DISR" };
1943+
let args = (tag_name.to_owned(), enum_layout.field(cx, tag_field.as_usize()).ty);
19381944
(Some(offset), Some(args))
19391945
}
19401946
_ => (None, None),

src/test/debuginfo/msvc-pretty-enums.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// only-cdb
2+
// ignore-tidy-linelength
23
// compile-flags:-g
34

45
// cdb-command: g
@@ -101,4 +102,4 @@ fn main() {
101102
zzz(); // #break
102103
}
103104

104-
fn zzz() { () }
105+
fn zzz() { () }

src/test/debuginfo/pretty-std.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ignore-freebsd: gdb package too new
22
// only-cdb // "Temporarily" ignored on GDB/LLDB due to debuginfo tests being disabled, see PR 47155
33
// ignore-android: FIXME(#10381)
4+
// ignore-tidy-linelength
45
// compile-flags:-g
56
// min-gdb-version: 7.7
67
// min-lldb-version: 310
@@ -115,7 +116,7 @@
115116
// cdb-command: dx none
116117
// cdb-check:none : None [Type: _enum<core::option::Option<i64>>]
117118
// cdb-command: dx some_string
118-
// cdb-check:some_string [Type: _enum<core::option::Option<alloc::string::String>, 1, 18446744073709551615, Some>]
119+
// cdb-check:some_string [Type: _enum<core::option::Option<alloc::string::String>, 1, [...], Some>]
119120

120121
#![allow(unused_variables)]
121122
use std::ffi::OsString;

0 commit comments

Comments
 (0)