Skip to content

Commit aaf5dfc

Browse files
thestingerthestinger
committed
---
yaml --- r: 55775 b: refs/heads/master c: a3e33cf h: refs/heads/master i: 55773: 49da9ad 55771: ca3d668 55767: cf4f709 55759: 0a35025 55743: 945c85f v: v3
1 parent ae0906b commit aaf5dfc

34 files changed

+389
-313
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 88ccee78a812b142a9f0d3d24d78bf6b5e190403
2+
refs/heads/master: a3e33cfb6e6eddf0e47bc98fd46075fab30978e1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a

‎trunk/src/libcore/num/f32.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,40 +301,53 @@ impl num::One for f32 {
301301

302302
#[cfg(notest)]
303303
impl Add<f32,f32> for f32 {
304+
#[inline(always)]
304305
fn add(&self, other: &f32) -> f32 { *self + *other }
305306
}
307+
306308
#[cfg(notest)]
307309
impl Sub<f32,f32> for f32 {
310+
#[inline(always)]
308311
fn sub(&self, other: &f32) -> f32 { *self - *other }
309312
}
313+
310314
#[cfg(notest)]
311315
impl Mul<f32,f32> for f32 {
316+
#[inline(always)]
312317
fn mul(&self, other: &f32) -> f32 { *self * *other }
313318
}
319+
314320
#[cfg(stage0,notest)]
315321
impl Div<f32,f32> for f32 {
322+
#[inline(always)]
316323
fn div(&self, other: &f32) -> f32 { *self / *other }
317324
}
325+
318326
#[cfg(stage1,notest)]
319327
#[cfg(stage2,notest)]
320328
#[cfg(stage3,notest)]
321329
impl Quot<f32,f32> for f32 {
322330
#[inline(always)]
323331
fn quot(&self, other: &f32) -> f32 { *self / *other }
324332
}
333+
325334
#[cfg(stage0,notest)]
326335
impl Modulo<f32,f32> for f32 {
336+
#[inline(always)]
327337
fn modulo(&self, other: &f32) -> f32 { *self % *other }
328338
}
339+
329340
#[cfg(stage1,notest)]
330341
#[cfg(stage2,notest)]
331342
#[cfg(stage3,notest)]
332343
impl Rem<f32,f32> for f32 {
333344
#[inline(always)]
334345
fn rem(&self, other: &f32) -> f32 { *self % *other }
335346
}
347+
336348
#[cfg(notest)]
337349
impl Neg<f32> for f32 {
350+
#[inline(always)]
338351
fn neg(&self) -> f32 { -*self }
339352
}
340353

‎trunk/src/libcore/num/float.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,18 +455,25 @@ impl num::Round for float {
455455
456456
#[cfg(notest)]
457457
impl Add<float,float> for float {
458+
#[inline(always)]
458459
fn add(&self, other: &float) -> float { *self + *other }
459460
}
461+
460462
#[cfg(notest)]
461463
impl Sub<float,float> for float {
464+
#[inline(always)]
462465
fn sub(&self, other: &float) -> float { *self - *other }
463466
}
467+
464468
#[cfg(notest)]
465469
impl Mul<float,float> for float {
470+
#[inline(always)]
466471
fn mul(&self, other: &float) -> float { *self * *other }
467472
}
473+
468474
#[cfg(stage0,notest)]
469475
impl Div<float,float> for float {
476+
#[inline(always)]
470477
fn div(&self, other: &float) -> float { *self / *other }
471478
}
472479
#[cfg(stage1,notest)]
@@ -478,6 +485,7 @@ impl Quot<float,float> for float {
478485
}
479486
#[cfg(stage0,notest)]
480487
impl Modulo<float,float> for float {
488+
#[inline(always)]
481489
fn modulo(&self, other: &float) -> float { *self % *other }
482490
}
483491
#[cfg(stage1,notest)]
@@ -489,6 +497,7 @@ impl Rem<float,float> for float {
489497
}
490498
#[cfg(notest)]
491499
impl Neg<float> for float {
500+
#[inline(always)]
492501
fn neg(&self) -> float { -*self }
493502
}
494503

‎trunk/src/libcore/num/int-template.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,40 +175,53 @@ impl num::One for T {
175175
176176
#[cfg(notest)]
177177
impl Add<T,T> for T {
178+
#[inline(always)]
178179
fn add(&self, other: &T) -> T { *self + *other }
179180
}
181+
180182
#[cfg(notest)]
181183
impl Sub<T,T> for T {
184+
#[inline(always)]
182185
fn sub(&self, other: &T) -> T { *self - *other }
183186
}
187+
184188
#[cfg(notest)]
185189
impl Mul<T,T> for T {
190+
#[inline(always)]
186191
fn mul(&self, other: &T) -> T { *self * *other }
187192
}
193+
188194
#[cfg(stage0,notest)]
189195
impl Div<T,T> for T {
196+
#[inline(always)]
190197
fn div(&self, other: &T) -> T { *self / *other }
191198
}
199+
192200
#[cfg(stage1,notest)]
193201
#[cfg(stage2,notest)]
194202
#[cfg(stage3,notest)]
195203
impl Quot<T,T> for T {
196204
#[inline(always)]
197205
fn quot(&self, other: &T) -> T { *self / *other }
198206
}
207+
199208
#[cfg(stage0,notest)]
200209
impl Modulo<T,T> for T {
210+
#[inline(always)]
201211
fn modulo(&self, other: &T) -> T { *self % *other }
202212
}
213+
203214
#[cfg(stage1,notest)]
204215
#[cfg(stage2,notest)]
205216
#[cfg(stage3,notest)]
206217
impl Rem<T,T> for T {
207218
#[inline(always)]
208219
fn rem(&self, other: &T) -> T { *self % *other }
209220
}
221+
210222
#[cfg(notest)]
211223
impl Neg<T> for T {
224+
#[inline(always)]
212225
fn neg(&self) -> T { -*self }
213226
}
214227
@@ -217,26 +230,31 @@ impl BitOr<T,T> for T {
217230
#[inline(always)]
218231
fn bitor(&self, other: &T) -> T { *self | *other }
219232
}
233+
220234
#[cfg(notest)]
221235
impl BitAnd<T,T> for T {
222236
#[inline(always)]
223237
fn bitand(&self, other: &T) -> T { *self & *other }
224238
}
239+
225240
#[cfg(notest)]
226241
impl BitXor<T,T> for T {
227242
#[inline(always)]
228243
fn bitxor(&self, other: &T) -> T { *self ^ *other }
229244
}
245+
230246
#[cfg(notest)]
231247
impl Shl<T,T> for T {
232248
#[inline(always)]
233249
fn shl(&self, other: &T) -> T { *self << *other }
234250
}
251+
235252
#[cfg(notest)]
236253
impl Shr<T,T> for T {
237254
#[inline(always)]
238255
fn shr(&self, other: &T) -> T { *self >> *other }
239256
}
257+
240258
#[cfg(notest)]
241259
impl Not<T> for T {
242260
#[inline(always)]

‎trunk/src/libcore/num/uint-template.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,40 +140,53 @@ impl num::One for T {
140140
141141
#[cfg(notest)]
142142
impl Add<T,T> for T {
143+
#[inline(always)]
143144
fn add(&self, other: &T) -> T { *self + *other }
144145
}
146+
145147
#[cfg(notest)]
146148
impl Sub<T,T> for T {
149+
#[inline(always)]
147150
fn sub(&self, other: &T) -> T { *self - *other }
148151
}
152+
149153
#[cfg(notest)]
150154
impl Mul<T,T> for T {
155+
#[inline(always)]
151156
fn mul(&self, other: &T) -> T { *self * *other }
152157
}
158+
153159
#[cfg(stage0,notest)]
154160
impl Div<T,T> for T {
161+
#[inline(always)]
155162
fn div(&self, other: &T) -> T { *self / *other }
156163
}
164+
157165
#[cfg(stage1,notest)]
158166
#[cfg(stage2,notest)]
159167
#[cfg(stage3,notest)]
160168
impl Quot<T,T> for T {
161169
#[inline(always)]
162170
fn quot(&self, other: &T) -> T { *self / *other }
163171
}
172+
164173
#[cfg(stage0,notest)]
165174
impl Modulo<T,T> for T {
175+
#[inline(always)]
166176
fn modulo(&self, other: &T) -> T { *self % *other }
167177
}
178+
168179
#[cfg(stage1,notest)]
169180
#[cfg(stage2,notest)]
170181
#[cfg(stage3,notest)]
171182
impl Rem<T,T> for T {
172183
#[inline(always)]
173184
fn rem(&self, other: &T) -> T { *self % *other }
174185
}
186+
175187
#[cfg(notest)]
176188
impl Neg<T> for T {
189+
#[inline(always)]
177190
fn neg(&self) -> T { -*self }
178191
}
179192
@@ -182,26 +195,31 @@ impl BitOr<T,T> for T {
182195
#[inline(always)]
183196
fn bitor(&self, other: &T) -> T { *self | *other }
184197
}
198+
185199
#[cfg(notest)]
186200
impl BitAnd<T,T> for T {
187201
#[inline(always)]
188202
fn bitand(&self, other: &T) -> T { *self & *other }
189203
}
204+
190205
#[cfg(notest)]
191206
impl BitXor<T,T> for T {
192207
#[inline(always)]
193208
fn bitxor(&self, other: &T) -> T { *self ^ *other }
194209
}
210+
195211
#[cfg(notest)]
196212
impl Shl<T,T> for T {
197213
#[inline(always)]
198214
fn shl(&self, other: &T) -> T { *self << *other }
199215
}
216+
200217
#[cfg(notest)]
201218
impl Shr<T,T> for T {
202219
#[inline(always)]
203220
fn shr(&self, other: &T) -> T { *self >> *other }
204221
}
222+
205223
#[cfg(notest)]
206224
impl Not<T> for T {
207225
#[inline(always)]

‎trunk/src/libcore/rt/io/stdio.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ pub fn stdout() -> StdWriter { fail!() }
1717

1818
pub fn stderr() -> StdReader { fail!() }
1919

20-
pub fn print(_s: &str) { fail!() }
20+
pub fn print(s: &str) { fail!() }
2121

22-
pub fn println(_s: &str) { fail!() }
22+
pub fn println(s: &str) { fail!() }
2323

2424
pub enum StdStream {
2525
StdIn,

‎trunk/src/libcore/rt/uvio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use option::*;
1212
use result::*;
1313

14-
use super::io::net::ip::{IpAddr, Ipv4}; // n.b. Ipv4 is used only in tests
14+
use super::io::net::ip::{IpAddr, Ipv4};
1515
use super::uv::*;
1616
use super::rtio::*;
1717
use ops::Drop;

‎trunk/src/libcore/task/spawn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ pub fn spawn_raw(opts: TaskOpts, f: ~fn()) {
549549
}
550550
}
551551
552-
fn spawn_raw_newsched(_opts: TaskOpts, f: ~fn()) {
552+
fn spawn_raw_newsched(opts: TaskOpts, f: ~fn()) {
553553
use rt::sched::*;
554554
555555
let mut sched = local_sched::take();

‎trunk/src/librustc/metadata/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ fn doc_transformed_self_ty(doc: ebml::Doc,
247247
}
248248
}
249249
250-
pub fn item_type(_item_id: ast::def_id, item: ebml::Doc,
250+
pub fn item_type(item_id: ast::def_id, item: ebml::Doc,
251251
tcx: ty::ctxt, cdata: cmd) -> ty::t {
252252
doc_type(item, tcx, cdata)
253253
}

‎trunk/src/librustc/metadata/tydecode.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -279,28 +279,28 @@ fn parse_trait_ref(st: @mut PState, conv: conv_did) -> ty::TraitRef {
279279
280280
fn parse_ty(st: @mut PState, conv: conv_did) -> ty::t {
281281
match next(st) {
282-
'n' => return ty::mk_nil(),
283-
'z' => return ty::mk_bot(),
284-
'b' => return ty::mk_bool(),
285-
'i' => return ty::mk_int(),
286-
'u' => return ty::mk_uint(),
287-
'l' => return ty::mk_float(),
282+
'n' => return ty::mk_nil(st.tcx),
283+
'z' => return ty::mk_bot(st.tcx),
284+
'b' => return ty::mk_bool(st.tcx),
285+
'i' => return ty::mk_int(st.tcx),
286+
'u' => return ty::mk_uint(st.tcx),
287+
'l' => return ty::mk_float(st.tcx),
288288
'M' => {
289289
match next(st) {
290-
'b' => return ty::mk_mach_uint(ast::ty_u8),
291-
'w' => return ty::mk_mach_uint(ast::ty_u16),
292-
'l' => return ty::mk_mach_uint(ast::ty_u32),
293-
'd' => return ty::mk_mach_uint(ast::ty_u64),
294-
'B' => return ty::mk_mach_int(ast::ty_i8),
295-
'W' => return ty::mk_mach_int(ast::ty_i16),
296-
'L' => return ty::mk_mach_int(ast::ty_i32),
297-
'D' => return ty::mk_mach_int(ast::ty_i64),
298-
'f' => return ty::mk_mach_float(ast::ty_f32),
299-
'F' => return ty::mk_mach_float(ast::ty_f64),
290+
'b' => return ty::mk_mach_uint(st.tcx, ast::ty_u8),
291+
'w' => return ty::mk_mach_uint(st.tcx, ast::ty_u16),
292+
'l' => return ty::mk_mach_uint(st.tcx, ast::ty_u32),
293+
'd' => return ty::mk_mach_uint(st.tcx, ast::ty_u64),
294+
'B' => return ty::mk_mach_int(st.tcx, ast::ty_i8),
295+
'W' => return ty::mk_mach_int(st.tcx, ast::ty_i16),
296+
'L' => return ty::mk_mach_int(st.tcx, ast::ty_i32),
297+
'D' => return ty::mk_mach_int(st.tcx, ast::ty_i64),
298+
'f' => return ty::mk_mach_float(st.tcx, ast::ty_f32),
299+
'F' => return ty::mk_mach_float(st.tcx, ast::ty_f64),
300300
_ => fail!(~"parse_ty: bad numeric type")
301301
}
302302
}
303-
'c' => return ty::mk_char(),
303+
'c' => return ty::mk_char(st.tcx),
304304
't' => {
305305
assert!((next(st) == '['));
306306
let def = parse_def(st, NominalType, conv);

‎trunk/src/librustc/middle/check_match.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ pub fn is_useful(cx: @MatchCheckCtxt, m: &matrix, v: &[@pat]) -> useful {
211211
let real_pat = match m.find(|r| r[0].id != 0) {
212212
Some(r) => r[0], None => v[0]
213213
};
214-
let left_ty = if real_pat.id == 0 { ty::mk_nil() }
214+
let left_ty = if real_pat.id == 0 { ty::mk_nil(cx.tcx) }
215215
else { ty::node_id_to_type(cx.tcx, real_pat.id) };
216216
217217
match pat_ctor_id(cx, v[0]) {

‎trunk/src/librustc/middle/mem_categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ pub impl mem_categorization_ctxt {
749749
fn cat_index<N:ast_node>(&self,
750750
elt: N,
751751
base_cmt: cmt) -> cmt {
752-
let mt = match ty::index(base_cmt.ty) {
752+
let mt = match ty::index(self.tcx, base_cmt.ty) {
753753
Some(mt) => mt,
754754
None => {
755755
self.tcx.sess.span_bug(

‎trunk/src/librustc/middle/trans/_match.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,8 @@ pub fn compare_values(cx: block,
10731073
10741074
match ty::get(rhs_t).sty {
10751075
ty::ty_estr(ty::vstore_uniq) => {
1076-
let scratch_result = scratch_datum(cx, ty::mk_bool(), false);
1076+
let scratch_result = scratch_datum(cx, ty::mk_bool(cx.tcx()),
1077+
false);
10771078
let scratch_lhs = alloca(cx, val_ty(lhs));
10781079
Store(cx, lhs, scratch_lhs);
10791080
let scratch_rhs = alloca(cx, val_ty(rhs));
@@ -1091,7 +1092,8 @@ pub fn compare_values(cx: block,
10911092
}
10921093
}
10931094
ty::ty_estr(_) => {
1094-
let scratch_result = scratch_datum(cx, ty::mk_bool(), false);
1095+
let scratch_result = scratch_datum(cx, ty::mk_bool(cx.tcx()),
1096+
false);
10951097
let did = cx.tcx().lang_items.str_eq_fn();
10961098
let bcx = callee::trans_lang_call(cx, did,
10971099
~[lhs, rhs],

0 commit comments

Comments
 (0)