Skip to content

Commit 48ecd79

Browse files
borsbors
committed
---
yaml --- r: 57149 b: refs/heads/try c: d9896d5 h: refs/heads/master i: 57147: 6f537aa v: v3
1 parent 2ab86f1 commit 48ecd79

35 files changed

+315
-392
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
5-
refs/heads/try: a3e33cfb6e6eddf0e47bc98fd46075fab30978e1
5+
refs/heads/try: d9896d592b4af23e9a8e8893de77c99cbb85b2c2
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/src/libcore/num/f32.rs

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

302302
#[cfg(notest)]
303303
impl Add<f32,f32> for f32 {
304-
#[inline(always)]
305304
fn add(&self, other: &f32) -> f32 { *self + *other }
306305
}
307-
308306
#[cfg(notest)]
309307
impl Sub<f32,f32> for f32 {
310-
#[inline(always)]
311308
fn sub(&self, other: &f32) -> f32 { *self - *other }
312309
}
313-
314310
#[cfg(notest)]
315311
impl Mul<f32,f32> for f32 {
316-
#[inline(always)]
317312
fn mul(&self, other: &f32) -> f32 { *self * *other }
318313
}
319-
320314
#[cfg(stage0,notest)]
321315
impl Div<f32,f32> for f32 {
322-
#[inline(always)]
323316
fn div(&self, other: &f32) -> f32 { *self / *other }
324317
}
325-
326318
#[cfg(stage1,notest)]
327319
#[cfg(stage2,notest)]
328320
#[cfg(stage3,notest)]
329321
impl Quot<f32,f32> for f32 {
330322
#[inline(always)]
331323
fn quot(&self, other: &f32) -> f32 { *self / *other }
332324
}
333-
334325
#[cfg(stage0,notest)]
335326
impl Modulo<f32,f32> for f32 {
336-
#[inline(always)]
337327
fn modulo(&self, other: &f32) -> f32 { *self % *other }
338328
}
339-
340329
#[cfg(stage1,notest)]
341330
#[cfg(stage2,notest)]
342331
#[cfg(stage3,notest)]
343332
impl Rem<f32,f32> for f32 {
344333
#[inline(always)]
345334
fn rem(&self, other: &f32) -> f32 { *self % *other }
346335
}
347-
348336
#[cfg(notest)]
349337
impl Neg<f32> for f32 {
350-
#[inline(always)]
351338
fn neg(&self) -> f32 { -*self }
352339
}
353340

‎branches/try/src/libcore/num/float.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -455,25 +455,18 @@ impl num::Round for float {
455455
456456
#[cfg(notest)]
457457
impl Add<float,float> for float {
458-
#[inline(always)]
459458
fn add(&self, other: &float) -> float { *self + *other }
460459
}
461-
462460
#[cfg(notest)]
463461
impl Sub<float,float> for float {
464-
#[inline(always)]
465462
fn sub(&self, other: &float) -> float { *self - *other }
466463
}
467-
468464
#[cfg(notest)]
469465
impl Mul<float,float> for float {
470-
#[inline(always)]
471466
fn mul(&self, other: &float) -> float { *self * *other }
472467
}
473-
474468
#[cfg(stage0,notest)]
475469
impl Div<float,float> for float {
476-
#[inline(always)]
477470
fn div(&self, other: &float) -> float { *self / *other }
478471
}
479472
#[cfg(stage1,notest)]
@@ -485,7 +478,6 @@ impl Quot<float,float> for float {
485478
}
486479
#[cfg(stage0,notest)]
487480
impl Modulo<float,float> for float {
488-
#[inline(always)]
489481
fn modulo(&self, other: &float) -> float { *self % *other }
490482
}
491483
#[cfg(stage1,notest)]
@@ -497,7 +489,6 @@ impl Rem<float,float> for float {
497489
}
498490
#[cfg(notest)]
499491
impl Neg<float> for float {
500-
#[inline(always)]
501492
fn neg(&self) -> float { -*self }
502493
}
503494

‎branches/try/src/libcore/num/int-template.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -175,53 +175,40 @@ impl num::One for T {
175175
176176
#[cfg(notest)]
177177
impl Add<T,T> for T {
178-
#[inline(always)]
179178
fn add(&self, other: &T) -> T { *self + *other }
180179
}
181-
182180
#[cfg(notest)]
183181
impl Sub<T,T> for T {
184-
#[inline(always)]
185182
fn sub(&self, other: &T) -> T { *self - *other }
186183
}
187-
188184
#[cfg(notest)]
189185
impl Mul<T,T> for T {
190-
#[inline(always)]
191186
fn mul(&self, other: &T) -> T { *self * *other }
192187
}
193-
194188
#[cfg(stage0,notest)]
195189
impl Div<T,T> for T {
196-
#[inline(always)]
197190
fn div(&self, other: &T) -> T { *self / *other }
198191
}
199-
200192
#[cfg(stage1,notest)]
201193
#[cfg(stage2,notest)]
202194
#[cfg(stage3,notest)]
203195
impl Quot<T,T> for T {
204196
#[inline(always)]
205197
fn quot(&self, other: &T) -> T { *self / *other }
206198
}
207-
208199
#[cfg(stage0,notest)]
209200
impl Modulo<T,T> for T {
210-
#[inline(always)]
211201
fn modulo(&self, other: &T) -> T { *self % *other }
212202
}
213-
214203
#[cfg(stage1,notest)]
215204
#[cfg(stage2,notest)]
216205
#[cfg(stage3,notest)]
217206
impl Rem<T,T> for T {
218207
#[inline(always)]
219208
fn rem(&self, other: &T) -> T { *self % *other }
220209
}
221-
222210
#[cfg(notest)]
223211
impl Neg<T> for T {
224-
#[inline(always)]
225212
fn neg(&self) -> T { -*self }
226213
}
227214
@@ -230,31 +217,26 @@ impl BitOr<T,T> for T {
230217
#[inline(always)]
231218
fn bitor(&self, other: &T) -> T { *self | *other }
232219
}
233-
234220
#[cfg(notest)]
235221
impl BitAnd<T,T> for T {
236222
#[inline(always)]
237223
fn bitand(&self, other: &T) -> T { *self & *other }
238224
}
239-
240225
#[cfg(notest)]
241226
impl BitXor<T,T> for T {
242227
#[inline(always)]
243228
fn bitxor(&self, other: &T) -> T { *self ^ *other }
244229
}
245-
246230
#[cfg(notest)]
247231
impl Shl<T,T> for T {
248232
#[inline(always)]
249233
fn shl(&self, other: &T) -> T { *self << *other }
250234
}
251-
252235
#[cfg(notest)]
253236
impl Shr<T,T> for T {
254237
#[inline(always)]
255238
fn shr(&self, other: &T) -> T { *self >> *other }
256239
}
257-
258240
#[cfg(notest)]
259241
impl Not<T> for T {
260242
#[inline(always)]

‎branches/try/src/libcore/num/strconv.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,6 @@ mod test {
655655
use option::*;
656656

657657
#[test]
658-
#[ignore(reason = "fails in x86")]
659658
fn from_str_ignore_underscores() {
660659
let s : Option<u8> = from_str_common("__1__", 2, false, false, false,
661660
ExpNone, false, true);
@@ -665,9 +664,9 @@ mod test {
665664
ExpNone, false, false);
666665
assert_eq!(n, None);
667666

668-
let f : Option<f32> = from_str_common("_1_._1_e_1_", 10, false, true, false,
667+
let f : Option<f32> = from_str_common("_1_._5_e_1_", 10, false, true, false,
669668
ExpDec, false, true);
670-
assert_eq!(f, Some(1.1e1f32));
669+
assert_eq!(f, Some(1.5e1f32));
671670
}
672671

673672
#[test]

‎branches/try/src/libcore/num/uint-template.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -140,53 +140,40 @@ impl num::One for T {
140140
141141
#[cfg(notest)]
142142
impl Add<T,T> for T {
143-
#[inline(always)]
144143
fn add(&self, other: &T) -> T { *self + *other }
145144
}
146-
147145
#[cfg(notest)]
148146
impl Sub<T,T> for T {
149-
#[inline(always)]
150147
fn sub(&self, other: &T) -> T { *self - *other }
151148
}
152-
153149
#[cfg(notest)]
154150
impl Mul<T,T> for T {
155-
#[inline(always)]
156151
fn mul(&self, other: &T) -> T { *self * *other }
157152
}
158-
159153
#[cfg(stage0,notest)]
160154
impl Div<T,T> for T {
161-
#[inline(always)]
162155
fn div(&self, other: &T) -> T { *self / *other }
163156
}
164-
165157
#[cfg(stage1,notest)]
166158
#[cfg(stage2,notest)]
167159
#[cfg(stage3,notest)]
168160
impl Quot<T,T> for T {
169161
#[inline(always)]
170162
fn quot(&self, other: &T) -> T { *self / *other }
171163
}
172-
173164
#[cfg(stage0,notest)]
174165
impl Modulo<T,T> for T {
175-
#[inline(always)]
176166
fn modulo(&self, other: &T) -> T { *self % *other }
177167
}
178-
179168
#[cfg(stage1,notest)]
180169
#[cfg(stage2,notest)]
181170
#[cfg(stage3,notest)]
182171
impl Rem<T,T> for T {
183172
#[inline(always)]
184173
fn rem(&self, other: &T) -> T { *self % *other }
185174
}
186-
187175
#[cfg(notest)]
188176
impl Neg<T> for T {
189-
#[inline(always)]
190177
fn neg(&self) -> T { -*self }
191178
}
192179
@@ -195,31 +182,26 @@ impl BitOr<T,T> for T {
195182
#[inline(always)]
196183
fn bitor(&self, other: &T) -> T { *self | *other }
197184
}
198-
199185
#[cfg(notest)]
200186
impl BitAnd<T,T> for T {
201187
#[inline(always)]
202188
fn bitand(&self, other: &T) -> T { *self & *other }
203189
}
204-
205190
#[cfg(notest)]
206191
impl BitXor<T,T> for T {
207192
#[inline(always)]
208193
fn bitxor(&self, other: &T) -> T { *self ^ *other }
209194
}
210-
211195
#[cfg(notest)]
212196
impl Shl<T,T> for T {
213197
#[inline(always)]
214198
fn shl(&self, other: &T) -> T { *self << *other }
215199
}
216-
217200
#[cfg(notest)]
218201
impl Shr<T,T> for T {
219202
#[inline(always)]
220203
fn shr(&self, other: &T) -> T { *self >> *other }
221204
}
222-
223205
#[cfg(notest)]
224206
impl Not<T> for T {
225207
#[inline(always)]

‎branches/try/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,

‎branches/try/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};
14+
use super::io::net::ip::{IpAddr, Ipv4}; // n.b. Ipv4 is used only in tests
1515
use super::uv::*;
1616
use super::rtio::*;
1717
use ops::Drop;

‎branches/try/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();

‎branches/try/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
}

‎branches/try/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(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),
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(),
288288
'M' => {
289289
match next(st) {
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),
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),
300300
_ => fail!(~"parse_ty: bad numeric type")
301301
}
302302
}
303-
'c' => return ty::mk_char(st.tcx),
303+
'c' => return ty::mk_char(),
304304
't' => {
305305
assert!((next(st) == '['));
306306
let def = parse_def(st, NominalType, conv);

‎branches/try/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(cx.tcx) }
214+
let left_ty = if real_pat.id == 0 { ty::mk_nil() }
215215
else { ty::node_id_to_type(cx.tcx, real_pat.id) };
216216
217217
match pat_ctor_id(cx, v[0]) {

‎branches/try/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(self.tcx, base_cmt.ty) {
752+
let mt = match ty::index(base_cmt.ty) {
753753
Some(mt) => mt,
754754
None => {
755755
self.tcx.sess.span_bug(

0 commit comments

Comments
 (0)