Skip to content

Commit dbe29db

Browse files
committed
chore: use shorthand initializer
1 parent 5367673 commit dbe29db

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

compiler/rustc_builtin_macros/src/alloc_error_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fn generate_handler(cx: &ExtCtxt<'_>, handler: Ident, span: Span, sig_span: Span
8080
let params = thin_vec![cx.param(span, size, ty_usize.clone()), cx.param(span, align, ty_usize)];
8181
let decl = cx.fn_decl(params, never);
8282
let header = FnHeader { safety: Safety::Unsafe(span), ..FnHeader::default() };
83-
let sig = FnSig { decl, header, span: span };
83+
let sig = FnSig { decl, header, span };
8484

8585
let body = Some(cx.block_expr(call));
8686
let kind = ItemKind::Fn(Box::new(Fn {

compiler/rustc_query_system/src/query/job.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ pub fn report_cycle<'a>(
588588
cycle_stack,
589589
stack_bottom: stack[0].query.description.to_owned(),
590590
alias,
591-
cycle_usage: cycle_usage,
591+
cycle_usage,
592592
stack_count,
593593
note_span: (),
594594
};

tests/ui-fulldeps/regions-mock-tcx.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ struct TypeContext<'tcx, 'ast> {
5959
impl<'tcx,'ast> TypeContext<'tcx, 'ast> {
6060
fn new(ty_arena: &'tcx TyArena<'tcx>, ast_arena: &'ast AstArena<'ast>)
6161
-> TypeContext<'tcx, 'ast> {
62-
TypeContext { ty_arena: ty_arena,
62+
TypeContext { ty_arena,
6363
types: Vec::new(),
6464
type_table: HashMap::new(),
6565

66-
ast_arena: ast_arena,
66+
ast_arena,
6767
ast_counter: 0 }
6868
}
6969

tests/ui/drop/dropck_legal_cycles.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ struct S<'a> {
450450

451451
impl<'a> Named for S<'a> {
452452
fn new(name: &'static str) -> S<'a> {
453-
S { name: name, mark: Cell::new(0), next: Cell::new(None) }
453+
S { name, mark: Cell::new(0), next: Cell::new(None) }
454454
}
455455
fn name(&self) -> &str { self.name }
456456
}
@@ -468,7 +468,7 @@ struct S2<'a> {
468468

469469
impl<'a> Named for S2<'a> {
470470
fn new(name: &'static str) -> S2<'a> {
471-
S2 { name: name, mark: Cell::new(0), next: Cell::new((None, None)) }
471+
S2 { name, mark: Cell::new(0), next: Cell::new((None, None)) }
472472
}
473473
fn name(&self) -> &str { self.name }
474474
}
@@ -488,7 +488,7 @@ struct V<'a> {
488488

489489
impl<'a> Named for V<'a> {
490490
fn new(name: &'static str) -> V<'a> {
491-
V { name: name,
491+
V { name,
492492
mark: Cell::new(0),
493493
contents: vec![Cell::new(None), Cell::new(None)]
494494
}
@@ -510,7 +510,7 @@ struct H<'a> {
510510

511511
impl<'a> Named for H<'a> {
512512
fn new(name: &'static str) -> H<'a> {
513-
H { name: name, mark: Cell::new(0), next: Cell::new(None) }
513+
H { name, mark: Cell::new(0), next: Cell::new(None) }
514514
}
515515
fn name(&self) -> &str { self.name }
516516
}
@@ -541,7 +541,7 @@ struct HM<'a> {
541541

542542
impl<'a> Named for HM<'a> {
543543
fn new(name: &'static str) -> HM<'a> {
544-
HM { name: name,
544+
HM { name,
545545
mark: Cell::new(0),
546546
contents: Cell::new(None)
547547
}
@@ -575,7 +575,7 @@ struct VD<'a> {
575575

576576
impl<'a> Named for VD<'a> {
577577
fn new(name: &'static str) -> VD<'a> {
578-
VD { name: name,
578+
VD { name,
579579
mark: Cell::new(0),
580580
contents: Cell::new(None)
581581
}
@@ -596,7 +596,7 @@ struct VM<'a> {
596596

597597
impl<'a> Named for VM<'a> {
598598
fn new(name: &'static str) -> VM<'a> {
599-
VM { name: name,
599+
VM { name,
600600
mark: Cell::new(0),
601601
contents: Cell::new(None)
602602
}
@@ -617,7 +617,7 @@ struct LL<'a> {
617617

618618
impl<'a> Named for LL<'a> {
619619
fn new(name: &'static str) -> LL<'a> {
620-
LL { name: name,
620+
LL { name,
621621
mark: Cell::new(0),
622622
contents: Cell::new(None)
623623
}
@@ -638,7 +638,7 @@ struct BH<'a> {
638638

639639
impl<'a> Named for BH<'a> {
640640
fn new(name: &'static str) -> BH<'a> {
641-
BH { name: name,
641+
BH { name,
642642
mark: Cell::new(0),
643643
contents: Cell::new(None)
644644
}
@@ -679,7 +679,7 @@ struct BTM<'a> {
679679

680680
impl<'a> Named for BTM<'a> {
681681
fn new(name: &'static str) -> BTM<'a> {
682-
BTM { name: name,
682+
BTM { name,
683683
mark: Cell::new(0),
684684
contents: Cell::new(None)
685685
}
@@ -720,7 +720,7 @@ struct BTS<'a> {
720720

721721
impl<'a> Named for BTS<'a> {
722722
fn new(name: &'static str) -> BTS<'a> {
723-
BTS { name: name,
723+
BTS { name,
724724
mark: Cell::new(0),
725725
contents: Cell::new(None)
726726
}
@@ -765,7 +765,7 @@ struct RCRC<'a>(Rc<RefCell<RCRCData<'a>>>);
765765
impl<'a> Named for RCRC<'a> {
766766
fn new(name: &'static str) -> Self {
767767
RCRC(Rc::new(RefCell::new(RCRCData {
768-
name: name, mark: Cell::new(0), children: (None, None), })))
768+
name, mark: Cell::new(0), children: (None, None), })))
769769
}
770770
fn name(&self) -> &str { self.0.borrow().name }
771771
}
@@ -802,7 +802,7 @@ struct ARCRC<'a>(Arc<RefCell<ARCRCData<'a>>>);
802802
impl<'a> Named for ARCRC<'a> {
803803
fn new(name: &'static str) -> Self {
804804
ARCRC(Arc::new(RefCell::new(ARCRCData {
805-
name: name, mark: Cell::new(0), children: (None, None), })))
805+
name, mark: Cell::new(0), children: (None, None), })))
806806
}
807807
fn name(&self) -> &str { self.0.borrow().name }
808808
}
@@ -885,7 +885,7 @@ struct ARCRW<'a>(Arc<RwLock<ARCRWData<'a>>>);
885885
impl<'a> Named for ARCRW<'a> {
886886
fn new(name: &'static str) -> Self {
887887
ARCRW(Arc::new(RwLock::new(ARCRWData {
888-
name: name, mark: Cell::new(0), children: (None, None), })))
888+
name, mark: Cell::new(0), children: (None, None), })))
889889
}
890890
fn name(&self) -> &str { self.0.read().unwrap().name }
891891
}

0 commit comments

Comments
 (0)