Skip to content

Commit 1c97aac

Browse files
graydongraydon
committed
---
yaml --- r: 55254 b: refs/heads/snap-stage3 c: 32ebaac h: refs/heads/master v: v3
1 parent 832d6fc commit 1c97aac

32 files changed

+262
-209
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: cdf604f43429fc539f337dbdc6106027b325d1d5
4+
refs/heads/snap-stage3: 32ebaacbc6dcd705562ac96af5c803f574284584
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/src/etc/unicode.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,6 @@ def emit_decomp_module(f, canon, compat):
235235
rf = open(r, "w")
236236

237237
(canon_decomp, compat_decomp, gencats) = load_unicode_data("UnicodeData.txt")
238-
239-
# Explain that the source code was generated by this script.
240-
rf.write('// The following code was generated by "src/etc/unicode.py"\n\n')
241-
242238
emit_property_module(rf, "general_category", gencats)
243239

244240
#emit_decomp_module(rf, canon_decomp, compat_decomp)

‎branches/snap-stage3/src/libcore/unicode.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#[doc(hidden)]; // FIXME #3538
1212

13-
// The following code was generated by "src/etc/unicode.py"
14-
1513
pub mod general_category {
1614

1715
fn bsearch_range_table(c: char, r: &'static [(char,char)]) -> bool {

‎branches/snap-stage3/src/librustc/middle/borrowck/loan.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ pub impl LoanContext {
115115
if cmt.lp.is_none() {
116116
self.bccx.tcx.sess.span_bug(
117117
cmt.span,
118-
"loan() called with non-lendable value");
118+
~"loan() called with non-lendable value");
119119
}
120120

121121
match cmt.cat {
122122
cat_binding(_) | cat_rvalue | cat_special(_) => {
123123
// should never be loanable
124124
self.bccx.tcx.sess.span_bug(
125125
cmt.span,
126-
"rvalue with a non-none lp");
126+
~"rvalue with a non-none lp");
127127
}
128128
cat_local(local_id) | cat_arg(local_id) | cat_self(local_id) => {
129129
// FIXME(#4903)
@@ -188,7 +188,7 @@ pub impl LoanContext {
188188
// Aliased data is simply not lendable.
189189
self.bccx.tcx.sess.span_bug(
190190
cmt.span,
191-
"aliased ptr with a non-none lp");
191+
~"aliased ptr with a non-none lp");
192192
}
193193
}
194194
}

‎branches/snap-stage3/src/librustc/middle/borrowck/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,11 +525,11 @@ pub impl BorrowckCtxt {
525525
self.note_and_explain_bckerr(err);
526526
}
527527

528-
fn span_err(&self, s: span, m: &str) {
528+
fn span_err(&self, s: span, m: ~str) {
529529
self.tcx.sess.span_err(s, m);
530530
}
531531

532-
fn span_note(&self, s: span, m: &str) {
532+
fn span_note(&self, s: span, m: ~str) {
533533
self.tcx.sess.span_note(s, m);
534534
}
535535

‎branches/snap-stage3/src/librustc/middle/borrowck/preserve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ pub impl<'self> PreserveCtxt<'self> {
124124
if self.root_managed_data {
125125
self.tcx().sess.span_bug(
126126
cmt.span,
127-
"preserve() called with local and !root_managed_data");
127+
~"preserve() called with local and !root_managed_data");
128128
}
129129
let local_region = self.tcx().region_maps.encl_region(local_id);
130130
self.compare_scope(cmt, local_region)

‎branches/snap-stage3/src/librustc/middle/trans/_match.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,8 @@ pub fn enter_opt<'r>(bcx: block,
557557
struct_id = found_struct_id;
558558
}
559559
_ => {
560-
tcx.sess.span_bug(p.span, "expected enum variant def");
560+
tcx.sess.span_bug(p.span, ~"expected enum \
561+
variant def");
561562
}
562563
}
563564

‎branches/snap-stage3/src/librustc/middle/trans/base.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,11 +1125,10 @@ pub fn init_local(bcx: block, local: @ast::local) -> block {
11251125
}
11261126

11271127
let llptr = match bcx.fcx.lllocals.find(&local.node.id) {
1128-
Some(&local_mem(v)) => v,
1129-
_ => {
1130-
bcx.tcx().sess.span_bug(local.span,
1131-
"init_local: Someone forgot to document why it's\
1132-
safe to assume local.node.init must be local_mem!");
1128+
Some(&local_mem(v)) => v,
1129+
_ => { bcx.tcx().sess.span_bug(local.span,
1130+
~"init_local: Someone forgot to document why it's\
1131+
safe to assume local.node.init must be local_mem!");
11331132
}
11341133
};
11351134
@@ -2072,7 +2071,6 @@ pub fn trans_tuple_struct(ccx: @CrateContext,
20722071
let bcx = copy_args_to_allocas(fcx, bcx, fn_args, raw_llargs, arg_tys);
20732072
20742073
let repr = adt::represent_type(ccx, tup_ty);
2075-
adt::trans_start_init(bcx, repr, fcx.llretptr.get(), 0);
20762074
20772075
for fields.eachi |i, field| {
20782076
let lldestptr = adt::trans_field_ptr(bcx,

‎branches/snap-stage3/src/librustc/middle/trans/callee.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,9 @@ pub fn trans_method_call(in_cx: block,
356356
origin)
357357
}
358358
None => {
359-
cx.tcx().sess.span_bug(call_ex.span, "method call expr wasn't in method map")
359+
cx.tcx().sess.span_bug(call_ex.span,
360+
~"method call expr wasn't in \
361+
method map")
360362
}
361363
}
362364
},

‎branches/snap-stage3/src/librustc/middle/trans/consts.rs

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ pub fn const_lit(cx: @CrateContext, e: @ast::expr, lit: ast::lit)
5858
}
5959
_ => {
6060
cx.sess.span_bug(lit.span,
61-
"floating point literal doesn't have the right type");
61+
~"floating point literal doesn't have the right \
62+
type");
6263
}
6364
}
6465
}
@@ -280,7 +281,7 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
280281
else { llvm::LLVMConstURem(te1, te2) }
281282
}
282283
ast::and |
283-
ast::or => cx.sess.span_unimpl(e.span, "binop logic"),
284+
ast::or => cx.sess.span_unimpl(e.span, ~"binop logic"),
284285
ast::bitxor => llvm::LLVMConstXor(te1, te2),
285286
ast::bitand => llvm::LLVMConstAnd(te1, te2),
286287
ast::bitor => llvm::LLVMConstOr(te1, te2),
@@ -294,7 +295,7 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
294295
ast::le |
295296
ast::ne |
296297
ast::ge |
297-
ast::gt => cx.sess.span_unimpl(e.span, "binop comparator")
298+
ast::gt => cx.sess.span_unimpl(e.span, ~"binop comparator")
298299
}
299300
}
300301
ast::expr_unary(u, e) => {
@@ -343,7 +344,8 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
343344
const_eval::const_int(i) => i as u64,
344345
const_eval::const_uint(u) => u,
345346
_ => cx.sess.span_bug(index.span,
346-
"index is not an integer-constant expression")
347+
~"index is not an integer-constant \
348+
expression")
347349
};
348350
let (arr, len) = match ty::get(bt).sty {
349351
ty::ty_evec(_, vstore) | ty::ty_estr(vstore) =>
@@ -361,10 +363,12 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
361363
unit_sz))
362364
},
363365
_ => cx.sess.span_bug(base.span,
364-
"index-expr base must be fixed-size or slice")
366+
~"index-expr base must be \
367+
fixed-size or slice")
365368
},
366369
_ => cx.sess.span_bug(base.span,
367-
"index-expr base must be a vector or string type")
370+
~"index-expr base must be \
371+
a vector or string type")
368372
};
369373

370374
let len = llvm::LLVMConstIntGetZExtValue(len) as u64;
@@ -376,7 +380,7 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
376380
// FIXME #3170: report this earlier on in the const-eval
377381
// pass. Reporting here is a bit late.
378382
cx.sess.span_err(e.span,
379-
"const index-expr is out of bounds");
383+
~"const index-expr is out of bounds");
380384
}
381385
const_get_elt(cx, arr, [iv as c_uint])
382386
}
@@ -450,7 +454,8 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
450454
match fs.find(|f| field_ty.ident == f.node.ident) {
451455
Some(ref f) => const_expr(cx, (*f).node.expr),
452456
None => {
453-
cx.tcx.sess.span_bug(e.span, "missing struct field");
457+
cx.tcx.sess.span_bug(
458+
e.span, ~"missing struct field");
454459
}
455460
}
456461
});
@@ -466,7 +471,8 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
466471
ast::expr_lit(ref lit) => {
467472
match lit.node {
468473
ast::lit_str(*) => { const_expr(cx, sub) }
469-
_ => { cx.sess.span_bug(e.span, "bad const-slice lit") }
474+
_ => { cx.sess.span_bug(e.span,
475+
~"bad const-slice lit") }
470476
}
471477
}
472478
ast::expr_vec(ref es, ast::m_imm) => {
@@ -481,7 +487,8 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
481487
let p = const_ptrcast(cx, gv, llunitty);
482488
C_struct(~[p, sz])
483489
}
484-
_ => cx.sess.span_bug(e.span, "bad const-slice expr")
490+
_ => cx.sess.span_bug(e.span,
491+
~"bad const-slice expr")
485492
}
486493
}
487494
ast::expr_path(pth) => {
@@ -513,7 +520,8 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
513520
C_null(llty)
514521
}
515522
_ => {
516-
cx.sess.span_bug(e.span, "expected a const, fn, struct, or variant def")
523+
cx.sess.span_bug(e.span, ~"expected a const, fn, \
524+
struct, or variant def")
517525
}
518526
}
519527
}
@@ -534,12 +542,13 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
534542
adt::trans_const(cx, repr, vinfo.disr_val,
535543
args.map(|a| const_expr(cx, *a)))
536544
}
537-
_ => cx.sess.span_bug(e.span, "expected a struct or variant def")
545+
_ => cx.sess.span_bug(e.span, ~"expected a struct or \
546+
variant def")
538547
}
539548
}
540549
ast::expr_paren(e) => { return const_expr(cx, e); }
541550
_ => cx.sess.span_bug(e.span,
542-
"bad constant expression type in consts::const_expr")
551+
~"bad constant expression type in consts::const_expr")
543552
};
544553
}
545554
}

‎branches/snap-stage3/src/librustc/middle/trans/datum.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,8 +761,8 @@ pub impl Datum {
761761
match self.try_deref(bcx, expr.id, derefs, false) {
762762
(Some(lvres), bcx) => DatumBlock { bcx: bcx, datum: lvres },
763763
(None, _) => {
764-
bcx.ccx().sess.span_bug(expr.span,
765-
"Cannot deref this expression");
764+
bcx.ccx().sess.span_bug(
765+
expr.span, ~"Cannot deref this expression");
766766
}
767767
}
768768
}

‎branches/snap-stage3/src/librustc/middle/trans/debuginfo.rs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ fn create_ty(cx: @CrateContext, t: ty::t, span: span)
756756
}
757757
},
758758
ty::ty_enum(_did, ref _substs) => {
759-
cx.sess.span_bug(span, "debuginfo for enum NYI")
759+
cx.sess.span_bug(span, ~"debuginfo for enum NYI")
760760
}
761761
ty::ty_box(ref mt) | ty::ty_uniq(ref mt) => {
762762
let boxed = create_ty(cx, mt.ty, span);
@@ -782,18 +782,18 @@ fn create_ty(cx: @CrateContext, t: ty::t, span: span)
782782
create_pointer_type(cx, t, span, pointee)
783783
},
784784
ty::ty_rptr(ref _region, ref _mt) => {
785-
cx.sess.span_bug(span, "debuginfo for rptr NYI")
785+
cx.sess.span_bug(span, ~"debuginfo for rptr NYI")
786786
},
787787
ty::ty_bare_fn(ref barefnty) => {
788788
let inputs = do barefnty.sig.inputs.map |a| { a.ty };
789789
let output = barefnty.sig.output;
790790
create_fn_ty(cx, t, inputs, output, span)
791791
},
792792
ty::ty_closure(ref _closurety) => {
793-
cx.sess.span_bug(span, "debuginfo for closure NYI")
793+
cx.sess.span_bug(span, ~"debuginfo for closure NYI")
794794
},
795795
ty::ty_trait(_did, ref _substs, ref _vstore, _) => {
796-
cx.sess.span_bug(span, "debuginfo for trait NYI")
796+
cx.sess.span_bug(span, ~"debuginfo for trait NYI")
797797
},
798798
ty::ty_struct(did, ref substs) => {
799799
let fields = ty::struct_fields(cx.tcx, did, substs);
@@ -860,12 +860,14 @@ pub fn create_local_var(bcx: block, local: @ast::local)
860860
let llptr = match bcx.fcx.lllocals.find(&local.node.id) {
861861
option::Some(&local_mem(v)) => v,
862862
option::Some(_) => {
863-
bcx.tcx().sess.span_bug(local.span, "local is bound to something weird");
863+
bcx.tcx().sess.span_bug(local.span, ~"local is bound to \
864+
something weird");
864865
}
865866
option::None => {
866867
match *bcx.fcx.lllocals.get(&local.node.pat.id) {
867868
local_imm(v) => v,
868-
_ => bcx.tcx().sess.span_bug(local.span, "local is bound to something weird")
869+
_ => bcx.tcx().sess.span_bug(local.span, ~"local is bound to \
870+
something weird")
869871
}
870872
}
871873
};
@@ -964,7 +966,8 @@ pub fn create_function(fcx: fn_ctxt) -> @Metadata<SubProgramMetadata> {
964966
ast::item_fn(ref decl, _, _, _, _) => {
965967
(item.ident, decl.output, item.id)
966968
}
967-
_ => fcx.ccx.sess.span_bug(item.span, "create_function: item bound to non-function")
969+
_ => fcx.ccx.sess.span_bug(item.span, ~"create_function: item \
970+
bound to non-function")
968971
}
969972
}
970973
ast_map::node_method(method, _, _) => {
@@ -976,10 +979,12 @@ pub fn create_function(fcx: fn_ctxt) -> @Metadata<SubProgramMetadata> {
976979
((dbg_cx.names)(~"fn"), decl.output, expr.id)
977980
}
978981
_ => fcx.ccx.sess.span_bug(expr.span,
979-
"create_function: expected an expr_fn_block here")
982+
~"create_function: \
983+
expected an expr_fn_block here")
980984
}
981985
}
982-
_ => fcx.ccx.sess.bug("create_function: unexpected sort of node")
986+
_ => fcx.ccx.sess.bug(~"create_function: unexpected \
987+
sort of node")
983988
};
984989

985990
debug!("%?", ident);

‎branches/snap-stage3/src/librustc/middle/trans/expr.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
690690
}
691691
_ => {
692692
bcx.tcx().sess.span_bug(expr.span,
693-
"expr_cast of non-trait");
693+
~"expr_cast of non-trait");
694694
}
695695
}
696696
}
@@ -700,7 +700,8 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
700700
_ => {
701701
bcx.tcx().sess.span_bug(
702702
expr.span,
703-
fmt!("trans_rvalue_dps_unadjusted reached fall-through case: %?",
703+
fmt!("trans_rvalue_dps_unadjusted reached \
704+
fall-through case: %?",
704705
expr.node));
705706
}
706707
}
@@ -1201,7 +1202,7 @@ fn trans_rec_or_struct(bcx: block,
12011202
}
12021203
None => {
12031204
tcx.sess.span_bug(field.span,
1204-
"Couldn't find field in struct type")
1205+
~"Couldn't find field in struct type")
12051206
}
12061207
}
12071208
};
@@ -1477,15 +1478,15 @@ fn trans_eager_binop(bcx: block,
14771478
} else {
14781479
if !ty::type_is_scalar(rhs_t) {
14791480
bcx.tcx().sess.span_bug(binop_expr.span,
1480-
"non-scalar comparison");
1481+
~"non-scalar comparison");
14811482
}
14821483
let cmpr = base::compare_scalar_types(bcx, lhs, rhs, rhs_t, op);
14831484
bcx = cmpr.bcx;
14841485
ZExt(bcx, cmpr.val, T_i8())
14851486
}
14861487
}
14871488
_ => {
1488-
bcx.tcx().sess.span_bug(binop_expr.span, "unexpected binop");
1489+
bcx.tcx().sess.span_bug(binop_expr.span, ~"unexpected binop");
14891490
}
14901491
};
14911492

‎branches/snap-stage3/src/librustc/middle/trans/foreign.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ pub fn trans_intrinsic(ccx: @CrateContext,
10801080
_ => {
10811081
// Could we make this an enum rather than a string? does it get
10821082
// checked earlier?
1083-
ccx.sess.span_bug(item.span, "unknown intrinsic");
1083+
ccx.sess.span_bug(item.span, ~"unknown intrinsic");
10841084
}
10851085
}
10861086
build_return(bcx);

‎branches/snap-stage3/src/librustc/middle/trans/monomorphize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ pub fn monomorphic_fn(ccx: @CrateContext,
160160
// causing an infinite expansion.
161161
if depth > 30 {
162162
ccx.sess.span_fatal(
163-
span, "overly deep expansion of inlined function");
163+
span, ~"overly deep expansion of inlined function");
164164
}
165165
ccx.monomorphizing.insert(fn_id, depth + 1);
166166

0 commit comments

Comments
 (0)