Tidy too long lines

Author: denismerigoux

src/librustc_codegen_llvm/base.rs

@@ -451,7 +451,10 @@ pub fn memcpy_ty<'a, 'll: 'a, 'tcx: 'll, Builder : BuilderMethods<'a, 'll, 'tcx>
  bx.call_memcpy(dst, src, bx.cx().const_usize(size), align, flags);
 }
 
-pub fn codegen_instance<'a, 'll: 'a, 'tcx: 'll>(cx: &'a CodegenCx<'ll, 'tcx, &'ll Value>, instance: Instance<'tcx>) {
+pub fn codegen_instance<'a, 'll: 'a, 'tcx: 'll>(
+ cx: &'a CodegenCx<'ll, 'tcx, &'ll Value>,
+ instance: Instance<'tcx>
+) {
  let _s = if cx.sess().codegen_stats() {
  let mut instance_name = String::new();
  DefPathBasedNames::new(cx.tcx, true, true)
@@ -476,7 +479,9 @@ pub fn codegen_instance<'a, 'll: 'a, 'tcx: 'll>(cx: &'a CodegenCx<'ll, 'tcx, &'l
  cx.stats.borrow_mut().n_closures += 1;
 
  let mir = cx.tcx.instance_mir(instance.def);
- mir::codegen_mir::<'a, 'll, 'tcx, Builder<'a, 'll, 'tcx, &'ll Value>>(cx, lldecl, &mir, instance, sig);
+ mir::codegen_mir::<'a, 'll, 'tcx, Builder<'a, 'll, 'tcx, &'ll Value>>(
+ cx, lldecl, &mir, instance, sig
+ );
 }
 
 pub fn set_link_section(llval: &Value, attrs: &CodegenFnAttrs) {

src/librustc_codegen_llvm/debuginfo/mod.rs

@@ -474,7 +474,9 @@ impl<'ll, 'tcx: 'll> DebugInfoMethods<'ll, 'tcx> for CodegenCx<'ll, 'tcx, &'ll V
  name_to_append_suffix_to.push_str(",");
  }
 
- let actual_type = cx.tcx.normalize_erasing_regions(ParamEnv::reveal_all(), actual_type);
+ let actual_type = cx.tcx.normalize_erasing_regions(
+ ParamEnv::reveal_all(), actual_type
+ );
  // Add actual type name to <...> clause of function name
  let actual_type_name = compute_debuginfo_type_name(cx,
  actual_type,
@@ -488,7 +490,9 @@ impl<'ll, 'tcx: 'll> DebugInfoMethods<'ll, 'tcx> for CodegenCx<'ll, 'tcx, &'ll V
  let names = get_parameter_names(cx, generics);
  substs.iter().zip(names).filter_map(|(kind, name)| {
  if let UnpackedKind::Type(ty) = kind.unpack() {
- let actual_type = cx.tcx.normalize_erasing_regions(ParamEnv::reveal_all(), ty);
+ let actual_type = cx.tcx.normalize_erasing_regions(
+ ParamEnv::reveal_all(), ty
+ );
  let actual_type_metadata =
  type_metadata(cx, actual_type, syntax_pos::DUMMY_SP);
  let name = SmallCStr::new(&name.as_str());

src/librustc_codegen_llvm/interfaces/builder.rs

@@ -201,9 +201,18 @@ pub trait BuilderMethods<'a, 'll :'a, 'tcx: 'll> : HasCodegen<'a, 'll, 'tcx> +
  lhs: <Self::CodegenCx as Backend<'ll>>::Value,
  rhs: <Self::CodegenCx as Backend<'ll>>::Value
  ) -> <Self::CodegenCx as Backend<'ll>>::Value;
- fn neg(&self, v: <Self::CodegenCx as Backend<'ll>>::Value) -> <Self::CodegenCx as Backend<'ll>>::Value;
- fn fneg(&self, v: <Self::CodegenCx as Backend<'ll>>::Value) -> <Self::CodegenCx as Backend<'ll>>::Value;
- fn not(&self, v: <Self::CodegenCx as Backend<'ll>>::Value) -> <Self::CodegenCx as Backend<'ll>>::Value;
+ fn neg(
+ &self,
+ v: <Self::CodegenCx as Backend<'ll>>::Value
+ ) -> <Self::CodegenCx as Backend<'ll>>::Value;
+ fn fneg(
+ &self,
+ v: <Self::CodegenCx as Backend<'ll>>::Value
+ ) -> <Self::CodegenCx as Backend<'ll>>::Value;
+ fn not(
+ &self,
+ v: <Self::CodegenCx as Backend<'ll>>::Value
+ ) -> <Self::CodegenCx as Backend<'ll>>::Value;
 
  fn alloca(
  &self,

src/librustc_codegen_llvm/intrinsic.rs

@@ -676,8 +676,10 @@ impl IntrinsicCallMethods<'a, 'll, 'tcx> for Builder<'a, 'll, 'tcx, &'ll Value>
 
  let val = match intr.definition {
  intrinsics::IntrinsicDef::Named(name) => {
- let f = cx.declare_cfn( name,
- cx.type_func(&inputs, outputs));
+ let f = cx.declare_cfn(
+ name,
+ cx.type_func(&inputs, outputs)
+ );
  self.call(f, &llargs, None)
  }
  };

src/librustc_codegen_llvm/mir/analyze.rs

@@ -56,7 +56,10 @@ pub fn non_ssa_locals<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'
  analyzer.non_ssa_locals
 }
 
-struct LocalAnalyzer<'mir, 'a: 'mir, 'f: 'mir, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>> {
+struct LocalAnalyzer<
+ 'mir, 'a: 'mir, 'f: 'mir, 'll: 'a + 'f, 'tcx: 'll,
+ Cx: 'a + CodegenMethods<'ll, 'tcx>
+ > {
  fx: &'mir FunctionCx<'a, 'f, 'll, 'tcx, Cx>,
  dominators: Dominators<mir::BasicBlock>,
  non_ssa_locals: BitSet<mir::Local>,
@@ -109,9 +112,9 @@ impl<Cx: 'a + CodegenMethods<'ll, 'tcx>> LocalAnalyzer<'mir, 'a, 'f, 'll, 'tcx,
  }
 }
 
-impl<'mir, 'a: 'mir, 'f: 'mir, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>> Visitor<'tcx>
- for LocalAnalyzer<'mir, 'a, 'f, 'll, 'tcx, Cx>
- where &'a Cx : LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
+impl<'mir, 'a: 'mir, 'f: 'mir, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>>
+ Visitor<'tcx> for LocalAnalyzer<'mir, 'a, 'f, 'll, 'tcx, Cx> where
+ &'a Cx : LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
 {
  fn visit_assign(&mut self,
  block: mir::BasicBlock,

src/librustc_codegen_llvm/mir/constant.rs

@@ -77,8 +77,9 @@ pub fn codegen_static_initializer(
  Ok((const_alloc_to_llvm(cx, alloc), alloc))
 }
 
-impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: CodegenMethods<'ll, 'tcx>> FunctionCx<'a, 'f, 'll, 'tcx, Cx>
- where &'a Cx: LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
+impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: CodegenMethods<'ll, 'tcx>>
+ FunctionCx<'a, 'f, 'll, 'tcx, Cx> where
+ &'a Cx: LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
 {
  fn fully_evaluate<Bx: BuilderMethods<'a, 'll, 'tcx, CodegenCx=Cx>>(
  &mut self,

src/librustc_codegen_llvm/mir/mod.rs

@@ -283,7 +283,8 @@ pub fn codegen_mir<'a, 'll: 'a, 'tcx: 'll, Bx: BuilderMethods<'a, 'll, 'tcx>>(
  if let Some(name) = decl.name {
  // User variable
  let debug_scope = fx.scopes[decl.visibility_scope];
- let dbg = debug_scope.is_valid() && bx.cx().sess().opts.debuginfo == DebugInfo::Full;
+ let dbg =
+ debug_scope.is_valid() && bx.cx().sess().opts.debuginfo == DebugInfo::Full;
 
  if !memory_locals.contains(local) && !dbg {
  debug!("alloc: {:?} ({}) -> operand", local, name);

src/librustc_codegen_llvm/mir/operand.rs

@@ -384,7 +384,9 @@ impl<'a, 'll: 'a, 'tcx: 'll, V : 'll + CodegenObject> OperandValue<V> {
  }
 }
 
-impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: CodegenMethods<'ll, 'tcx>> FunctionCx<'a, 'f, 'll, 'tcx, Cx> {
+impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: CodegenMethods<'ll, 'tcx>>
+ FunctionCx<'a, 'f, 'll, 'tcx, Cx>
+{
  fn maybe_codegen_consume_direct<Bx: BuilderMethods<'a, 'll, 'tcx, CodegenCx=Cx>>(
  &mut self,
  bx: &Bx,

src/librustc_codegen_llvm/mir/place.rs

@@ -395,8 +395,9 @@ impl<'a, 'll: 'a, 'tcx: 'll, V : 'll + CodegenObject> PlaceRef<'tcx, V> {
  }
 }
 
-impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>> FunctionCx<'a, 'f, 'll, 'tcx, Cx>
- where &'a Cx: LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
+impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>>
+ FunctionCx<'a, 'f, 'll, 'tcx, Cx> where
+ &'a Cx: LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
 {
  pub fn codegen_place<Bx: BuilderMethods<'a, 'll, 'tcx, CodegenCx=Cx>>(
  &mut self,

src/librustc_codegen_llvm/mir/rvalue.rs

@@ -28,8 +28,9 @@ use super::{FunctionCx, LocalRef};
 use super::operand::{OperandRef, OperandValue};
 use super::place::PlaceRef;
 
-impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>> FunctionCx<'a, 'f, 'll, 'tcx, Cx>
- where &'a Cx: LayoutOf<Ty = Ty<'tcx>, TyLayout = TyLayout<'tcx>> + HasTyCtxt<'tcx>
+impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>>
+ FunctionCx<'a, 'f, 'll, 'tcx, Cx> where
+ &'a Cx: LayoutOf<Ty = Ty<'tcx>, TyLayout = TyLayout<'tcx>> + HasTyCtxt<'tcx>
 {
  pub fn codegen_rvalue<Bx: BuilderMethods<'a, 'll, 'tcx, CodegenCx=Cx>>(
  &mut self,
@@ -723,8 +724,9 @@ impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>> Functi
  }
 }
 
-impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>> FunctionCx<'a, 'f, 'll, 'tcx, Cx>
- where &'a Cx : LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
+impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: 'a + CodegenMethods<'ll, 'tcx>>
+ FunctionCx<'a, 'f, 'll, 'tcx, Cx> where
+ &'a Cx : LayoutOf<Ty=Ty<'tcx>, TyLayout=TyLayout<'tcx>> + HasTyCtxt<'tcx>
 {
  pub fn rvalue_creates_operand(&self, rvalue: &mir::Rvalue<'tcx>) -> bool {
  match *rvalue {