Skip to content

Commit 14e8bc5

Browse files
author
Ulrik Sverdrup
committed
---
yaml --- r: 190909 b: refs/heads/auto c: ee8af91 h: refs/heads/master i: 190907: 586d1d9 v: v3
1 parent 5154b90 commit 14e8bc5

File tree

24 files changed

+490
-575
lines changed

24 files changed

+490
-575
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 80a0d8223d527d8adf2a4a2a4d3856af98df69f7
13+
refs/heads/auto: ee8af9109f4b8ccad4e33fe44141ad107cad4341
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/configure

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,7 @@ case $CFG_CPUTYPE in
461461
CFG_CPUTYPE=aarch64
462462
;;
463463

464-
# At some point, when ppc64[le] support happens, this will need to do
465-
# something clever. For now it's safe to assume that we're only ever
466-
# interested in building 32 bit.
467-
powerpc | ppc | ppc64)
464+
powerpc)
468465
CFG_CPUTYPE=powerpc
469466
;;
470467

branches/auto/src/libcore/tuple.rs

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ macro_rules! e {
5252
macro_rules! tuple_impls {
5353
($(
5454
$Tuple:ident {
55-
$(($valN:ident, $refN:ident, $mutN:ident, $idx:tt) -> $T:ident)+
55+
$(($idx:tt) -> $T:ident)+
5656
}
5757
)+) => {
5858
$(
@@ -156,105 +156,105 @@ macro_rules! lexical_cmp {
156156

157157
tuple_impls! {
158158
Tuple1 {
159-
(val0, ref0, mut0, 0) -> A
159+
(0) -> A
160160
}
161161
Tuple2 {
162-
(val0, ref0, mut0, 0) -> A
163-
(val1, ref1, mut1, 1) -> B
162+
(0) -> A
163+
(1) -> B
164164
}
165165
Tuple3 {
166-
(val0, ref0, mut0, 0) -> A
167-
(val1, ref1, mut1, 1) -> B
168-
(val2, ref2, mut2, 2) -> C
166+
(0) -> A
167+
(1) -> B
168+
(2) -> C
169169
}
170170
Tuple4 {
171-
(val0, ref0, mut0, 0) -> A
172-
(val1, ref1, mut1, 1) -> B
173-
(val2, ref2, mut2, 2) -> C
174-
(val3, ref3, mut3, 3) -> D
171+
(0) -> A
172+
(1) -> B
173+
(2) -> C
174+
(3) -> D
175175
}
176176
Tuple5 {
177-
(val0, ref0, mut0, 0) -> A
178-
(val1, ref1, mut1, 1) -> B
179-
(val2, ref2, mut2, 2) -> C
180-
(val3, ref3, mut3, 3) -> D
181-
(val4, ref4, mut4, 4) -> E
177+
(0) -> A
178+
(1) -> B
179+
(2) -> C
180+
(3) -> D
181+
(4) -> E
182182
}
183183
Tuple6 {
184-
(val0, ref0, mut0, 0) -> A
185-
(val1, ref1, mut1, 1) -> B
186-
(val2, ref2, mut2, 2) -> C
187-
(val3, ref3, mut3, 3) -> D
188-
(val4, ref4, mut4, 4) -> E
189-
(val5, ref5, mut5, 5) -> F
184+
(0) -> A
185+
(1) -> B
186+
(2) -> C
187+
(3) -> D
188+
(4) -> E
189+
(5) -> F
190190
}
191191
Tuple7 {
192-
(val0, ref0, mut0, 0) -> A
193-
(val1, ref1, mut1, 1) -> B
194-
(val2, ref2, mut2, 2) -> C
195-
(val3, ref3, mut3, 3) -> D
196-
(val4, ref4, mut4, 4) -> E
197-
(val5, ref5, mut5, 5) -> F
198-
(val6, ref6, mut6, 6) -> G
192+
(0) -> A
193+
(1) -> B
194+
(2) -> C
195+
(3) -> D
196+
(4) -> E
197+
(5) -> F
198+
(6) -> G
199199
}
200200
Tuple8 {
201-
(val0, ref0, mut0, 0) -> A
202-
(val1, ref1, mut1, 1) -> B
203-
(val2, ref2, mut2, 2) -> C
204-
(val3, ref3, mut3, 3) -> D
205-
(val4, ref4, mut4, 4) -> E
206-
(val5, ref5, mut5, 5) -> F
207-
(val6, ref6, mut6, 6) -> G
208-
(val7, ref7, mut7, 7) -> H
201+
(0) -> A
202+
(1) -> B
203+
(2) -> C
204+
(3) -> D
205+
(4) -> E
206+
(5) -> F
207+
(6) -> G
208+
(7) -> H
209209
}
210210
Tuple9 {
211-
(val0, ref0, mut0, 0) -> A
212-
(val1, ref1, mut1, 1) -> B
213-
(val2, ref2, mut2, 2) -> C
214-
(val3, ref3, mut3, 3) -> D
215-
(val4, ref4, mut4, 4) -> E
216-
(val5, ref5, mut5, 5) -> F
217-
(val6, ref6, mut6, 6) -> G
218-
(val7, ref7, mut7, 7) -> H
219-
(val8, ref8, mut8, 8) -> I
211+
(0) -> A
212+
(1) -> B
213+
(2) -> C
214+
(3) -> D
215+
(4) -> E
216+
(5) -> F
217+
(6) -> G
218+
(7) -> H
219+
(8) -> I
220220
}
221221
Tuple10 {
222-
(val0, ref0, mut0, 0) -> A
223-
(val1, ref1, mut1, 1) -> B
224-
(val2, ref2, mut2, 2) -> C
225-
(val3, ref3, mut3, 3) -> D
226-
(val4, ref4, mut4, 4) -> E
227-
(val5, ref5, mut5, 5) -> F
228-
(val6, ref6, mut6, 6) -> G
229-
(val7, ref7, mut7, 7) -> H
230-
(val8, ref8, mut8, 8) -> I
231-
(val9, ref9, mut9, 9) -> J
222+
(0) -> A
223+
(1) -> B
224+
(2) -> C
225+
(3) -> D
226+
(4) -> E
227+
(5) -> F
228+
(6) -> G
229+
(7) -> H
230+
(8) -> I
231+
(9) -> J
232232
}
233233
Tuple11 {
234-
(val0, ref0, mut0, 0) -> A
235-
(val1, ref1, mut1, 1) -> B
236-
(val2, ref2, mut2, 2) -> C
237-
(val3, ref3, mut3, 3) -> D
238-
(val4, ref4, mut4, 4) -> E
239-
(val5, ref5, mut5, 5) -> F
240-
(val6, ref6, mut6, 6) -> G
241-
(val7, ref7, mut7, 7) -> H
242-
(val8, ref8, mut8, 8) -> I
243-
(val9, ref9, mut9, 9) -> J
244-
(val10, ref10, mut10, 10) -> K
234+
(0) -> A
235+
(1) -> B
236+
(2) -> C
237+
(3) -> D
238+
(4) -> E
239+
(5) -> F
240+
(6) -> G
241+
(7) -> H
242+
(8) -> I
243+
(9) -> J
244+
(10) -> K
245245
}
246246
Tuple12 {
247-
(val0, ref0, mut0, 0) -> A
248-
(val1, ref1, mut1, 1) -> B
249-
(val2, ref2, mut2, 2) -> C
250-
(val3, ref3, mut3, 3) -> D
251-
(val4, ref4, mut4, 4) -> E
252-
(val5, ref5, mut5, 5) -> F
253-
(val6, ref6, mut6, 6) -> G
254-
(val7, ref7, mut7, 7) -> H
255-
(val8, ref8, mut8, 8) -> I
256-
(val9, ref9, mut9, 9) -> J
257-
(val10, ref10, mut10, 10) -> K
258-
(val11, ref11, mut11, 11) -> L
247+
(0) -> A
248+
(1) -> B
249+
(2) -> C
250+
(3) -> D
251+
(4) -> E
252+
(5) -> F
253+
(6) -> G
254+
(7) -> H
255+
(8) -> I
256+
(9) -> J
257+
(10) -> K
258+
(11) -> L
259259
}
260260
}

branches/auto/src/librustc_driver/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#![feature(staged_api)]
3838
#![feature(exit_status)]
3939
#![feature(io)]
40-
#![feature(set_stdio)]
40+
#![feature(set_panic)]
4141

4242
extern crate arena;
4343
extern crate flate;

branches/auto/src/librustdoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#![feature(core)]
2727
#![feature(exit_status)]
2828
#![feature(int_uint)]
29-
#![feature(set_stdio)]
29+
#![feature(set_panic)]
3030
#![feature(libc)]
3131
#![feature(old_path)]
3232
#![feature(rustc_private)]

branches/auto/src/libstd/env.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ pub fn get_exit_status() -> i32 {
452452
EXIT_STATUS.load(Ordering::SeqCst) as i32
453453
}
454454

455-
/// An iterator over the arguments of a process, yielding a `String` value
455+
/// An iterator over the arguments of a process, yielding an `String` value
456456
/// for each argument.
457457
///
458458
/// This structure is created through the `std::env::args` method.

branches/auto/src/libstd/io/mod.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
// except according to those terms.
1010

1111
//! Traits, helpers, and type definitions for core I/O functionality.
12+
//!
13+
//! > **NOTE**: This module is very much a work in progress and is under active
14+
//! > development. At this time it is still recommended to use the `old_io`
15+
//! > module while the details of this module shake out.
1216
1317
#![stable(feature = "rust1", since = "1.0.0")]
1418

@@ -33,10 +37,10 @@ pub use self::buffered::IntoInnerError;
3337
pub use self::cursor::Cursor;
3438
pub use self::error::{Result, Error, ErrorKind};
3539
pub use self::util::{copy, sink, Sink, empty, Empty, repeat, Repeat};
36-
pub use self::stdio::{stdin, stdout, stderr, _print, Stdin, Stdout, Stderr};
40+
pub use self::stdio::{stdin, stdout, stderr, Stdin, Stdout, Stderr};
3741
pub use self::stdio::{StdoutLock, StderrLock, StdinLock};
3842
#[doc(no_inline, hidden)]
39-
pub use self::stdio::{set_panic, set_print};
43+
pub use self::stdio::set_panic;
4044

4145
#[macro_use] mod lazy;
4246

0 commit comments

Comments
 (0)