Skip to content

Commit bcaeb20

Browse files
committed
long line police
1 parent 14d7213 commit bcaeb20

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/librustc/middle/borrowck/preserve.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -358,14 +358,14 @@ priv impl &preserve_ctxt {
358358
debug!("Elected to root");
359359
let rk = {id: base.id, derefs: derefs};
360360
// This code could potentially lead cause boxes to be frozen
361-
// for longer than necessarily at runtime. It prevents an ICE
362-
// in trans; the fundamental problem is that it's hard to make
363-
// sure trans and borrowck have the same notion of scope. The
364-
// real fix is to clean up how trans handles cleanups, but
365-
// that's hard. If this becomes an issue, it's an option to just
366-
// change this to `let scope_to_use = scope_id;`. Though that
367-
// would potentially re-introduce the ICE. See #3511 for more
368-
// details.
361+
// for longer than necessarily at runtime. It prevents an
362+
// ICE in trans; the fundamental problem is that it's hard
363+
// to make sure trans and borrowck have the same notion of
364+
// scope. The real fix is to clean up how trans handles
365+
// cleanups, but that's hard. If this becomes an issue, it's
366+
// an option to just change this to `let scope_to_use =
367+
// scope_id;`. Though that would potentially re-introduce
368+
// the ICE. See #3511 for more details.
369369
let scope_to_use = if
370370
self.bccx.stmt_map.contains_key(scope_id) {
371371
// Root it in its parent scope, b/c

src/librustc/middle/trans/consts.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,8 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
405405
assert ast_util::is_local(def_id);
406406
let f = base::get_item_val(cx, def_id.node);
407407
match purity {
408-
ast::extern_fn => llvm::LLVMConstPointerCast(f, T_ptr(T_i8())),
408+
ast::extern_fn =>
409+
llvm::LLVMConstPointerCast(f, T_ptr(T_i8())),
409410
_ => C_struct(~[f, C_null(T_opaque_box_ptr(cx))])
410411
}
411412
}

0 commit comments

Comments
 (0)