Skip to content

Commit 5f99a4d

Browse files
committed
---
yaml --- r: 145276 b: refs/heads/try2 c: 407d179 h: refs/heads/master v: v3
1 parent f2a6f2d commit 5f99a4d

File tree

8 files changed

+216
-73
lines changed

8 files changed

+216
-73
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 963707f45d935e938adde9e37b56355a915660bd
8+
refs/heads/try2: 407d179f4e0b625e6911ebaf72c87cd35935fb06
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/RELEASES.txt

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,148 @@
1+
Version 0.8 (October 2013)
2+
--------------------------
3+
4+
* ~2100 changes, numerous bugfixes
5+
6+
* Language
7+
* The `for` loop syntax has changed to work with the `Iterator` trait.
8+
* At long last, unwinding works on Windows.
9+
* Default methods definitely mostly work.
10+
* Many trait inheritance bugs fixed.
11+
* Owned and borrowed trait objects work more reliably.
12+
* `copy` is no longer a keyword. It has been replaced by the `Clone` trait.
13+
* rustc no longer emits code for the `debug!` macro unless it is passed
14+
`--cfg debug`
15+
* mod.rs is now "blessed". When loading `mod foo;`, rustc will now look
16+
for foo.rs, then foo/mod.rs, and will generate an error when both are
17+
present.
18+
* Strings no longer contain trailing nulls. The new `std::c_str` module
19+
provides new mechanisms for converting to C strings.
20+
* The type of foreign functions is now `extern "C" fn` instead of `*u8'.
21+
* The FFI has been overhauled such that foreign functions are called directly,
22+
instead of through a stack-switching wrapper.
23+
* Calling a foreign function must be done through a Rust function with the
24+
`#[fixed_stack_segment]` attribute.
25+
* The `externfn!` macro can be used to declare both a foreign function and
26+
a `#[fixed_stack_segment]` wrapper at once.
27+
* `pub` and `priv` modifiers on `extern` blocks are no longer parsed.
28+
* `unsafe` is no longer allowed on extern fns - they are all unsafe.
29+
* `priv` is disallowed everywhere except for struct fields and enum variants.
30+
* `&T` (besides `&'static T`) is no longer allowed in `@T`.
31+
* `ref` bindings in irrefutable patterns work correctly now.
32+
* `char` is now prevented from containing invalid code points.
33+
* Casting to `bool` is no longer allowed.
34+
* `yield` is a reserved keyword.
35+
* `typeof` is a reserved keyword.
36+
* Crates may be imported by URL with `extern mod foo = "url";`.
37+
* Explicit enum discriminants may be given as uints as in `enum E { V = 0u }`
38+
* Static vectors can be initialized with repeating elements,
39+
e.g. `static foo: [u8, .. 100]: [0, .. 100];`.
40+
* Static structs can be initialized with functional record update,
41+
e.g. `static foo: Foo = Foo { a: 5, .. bar };`.
42+
* `cfg!` can be used to conditionally execute code based on the crate
43+
configuration, similarly to `#[cfg(...)]`.
44+
* The `unnecessary_qualification` lint detects unneeded module
45+
prefixes (default: allow).
46+
* Arithmetic operations have been implemented on the SIMD types in
47+
`std::unstable::simd`.
48+
* Exchange allocation headers were removed, reducing memory usage.
49+
* `format!` implements a completely new, extensible, and higher-performance
50+
string formatting system. It will replace `fmt!`.
51+
* `print!` and `println!` write formatted strings (using the `format!`
52+
extension) to stdout.
53+
* `write!` and `writeln!` write formatted strings (using the `format!`
54+
extension) to the new Writers in `std::rt::io`.
55+
* The library section in which a function or static is placed may
56+
be specified with `#[link_section = "..."]`.
57+
* The `proto!` syntax extension for defining bounded message protocols
58+
was removed.
59+
* `macro_rules!` is hygenic for `let` declarations.
60+
* The `#[export_name]` attribute specifies the name of a symbol.
61+
* `unreachable!` can be used to indicate unreachable code, and fails
62+
if executed.
63+
64+
* Libraries
65+
* std: Transitioned to the new runtime, written in Rust.
66+
* std: Added an experimental I/O library, `rt::io`, based on the new
67+
runtime.
68+
* std: A new generic `range` function was added to the prelude, replacing
69+
`uint::range` and friends.
70+
* std: `range_rev` no longer exists. Since range is an iterator it can be
71+
reversed with `range(lo, hi).invert()`.
72+
* std: The `chain` method on option renamed to `and_then`; `unwrap_or_default`
73+
renamed to `unwrap_or`.
74+
* std: The `iterator` module was renamed to `iter`.
75+
* std: Integral types now support the `checked_add`, `checked_sub`, and
76+
`checked_mul` operations for detecting overflow.
77+
* std: Many methods in `str`, `vec`, `option, `result` were renamed for
78+
consistency.
79+
* std: Methods are standardizing on conventions for casting methods:
80+
`to_foo` for copying, `into_foo` for moving, `as_foo` for temporary
81+
and cheap casts.
82+
* std: The `CString` type in `c_str` provides new ways to convert to and
83+
from C strings.
84+
* std: `DoubleEndedIterator` can yield elements in two directions.
85+
* std: The `mut_split` method on vectors partitions an `&mut [T]` into
86+
two splices.
87+
* std: `str::from_bytes` renamed to `str::from_utf8`.
88+
* std: `pop_opt` and `shift_opt` methods added to vectors.
89+
* std: The task-local data interface no longer uses @, and keys are
90+
no longer function pointers.
91+
* std: The `swap_unwrap` method of `Option` renamed to `take_unwrap`.
92+
* std: Added `SharedPort` to `comm`.
93+
* std: `Eq` has a default method for `ne`; only `eq` is required
94+
in implementations.
95+
* std: `Ord` has default methods for `le`, `gt` and `le`; only `lt`
96+
is required in implementations.
97+
* std: `is_utf8` performance is improved, impacting many string functions.
98+
* std: `os::MemoryMap` provides cross-platform mmap.
99+
* std: `ptr::offset` is now unsafe, but also more optimized. Offsets that
100+
are not 'in-bounds' are considered undefined.
101+
* std: Many freestanding functions in `vec` removed in favor of methods.
102+
* std: Many freestanding functions on scalar types removed in favor of
103+
methods.
104+
* std: Many options to task builders were removed since they don't make
105+
sense in the new scheduler design.
106+
* std: More containers implement `FromIterator` so can be created by the
107+
`collect` method.
108+
* std: More complete atomic types in `unstable::atomics`.
109+
* std: `comm::PortSet` removed.
110+
* std: Mutating methods in the `Set` and `Map` traits have been moved into
111+
the `MutableSet` and `MutableMap` traits. `Container::is_empty`,
112+
`Map::contains_key`, `MutableMap::insert`, and `MutableMap::remove` have
113+
default implementations.
114+
* extra: `dlist`, the doubly-linked list was modernized.
115+
* extra: Added a `hex` module with `ToHex` and `FromHex` traits.
116+
* extra: Added `glob` module, replacing `std::os::glob`.
117+
* extra: `rope` was removed.
118+
* extra: `deque` was renamed to `ringbuf`. `RingBuf` implements `Deque`.
119+
* extra: `net`, and `timer` were removed. The experimental replacements
120+
are `std::rt::io::net` and `std::rt::io::timer`.
121+
* extra: Iterators implemented for `SmallIntMap`.
122+
* extra: Iterators implemented for `Bitv` and `BitvSet`.
123+
* extra: `SmallIntSet` removed. Use `BitvSet`.
124+
* extra: Performance of JSON parsing greatly improved.
125+
* extra: `semver` updated to SemVer 2.0.0.
126+
* extra: `term` handles more terminals correctly.
127+
* extra: `dbg` module removed.
128+
129+
* Other
130+
* rustc's debug info generation (`-Z debug-info`) is greatly improved.
131+
* rustc accepts `--target-cpu` to compile to a specific CPU architecture,
132+
similarly to gcc's `--march` flag.
133+
* rustpkg has received many improvements.
134+
* rustpkg supports git tags as package IDs.
135+
* rustpkg builds into target-specific directories so it can be used for
136+
cross-compiling.
137+
* The number of concurrent test tasks is controlled by the environment
138+
variable RUST_TEST_TASKS.
139+
* The test harness can now report metrics for benchmarks.
140+
* All tools have man pages.
141+
* Programs compiled with `--test` now support the `-h` and `--help` flags.
142+
* The runtime uses jemalloc for allocations.
143+
* Segmented stacks are temporarily disabled as part of the transition to
144+
the new runtime. Stack overflows are possible!
145+
1146
Version 0.7 (July 2013)
2147
-----------------------
3148

branches/try2/src/librustc/middle/lang_items.rs

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -59,36 +59,36 @@ pub enum LangItem {
5959

6060
StrEqFnLangItem, // 19
6161
UniqStrEqFnLangItem, // 20
62-
FailFnLangItem, // 22
63-
FailBoundsCheckFnLangItem, // 23
64-
ExchangeMallocFnLangItem, // 24
65-
ClosureExchangeMallocFnLangItem, // 25
66-
ExchangeFreeFnLangItem, // 26
67-
MallocFnLangItem, // 27
68-
FreeFnLangItem, // 28
69-
BorrowAsImmFnLangItem, // 29
70-
BorrowAsMutFnLangItem, // 30
71-
ReturnToMutFnLangItem, // 31
72-
CheckNotBorrowedFnLangItem, // 32
73-
StrDupUniqFnLangItem, // 33
74-
RecordBorrowFnLangItem, // 34
75-
UnrecordBorrowFnLangItem, // 35
76-
77-
StartFnLangItem, // 36
78-
79-
TyDescStructLangItem, // 37
80-
TyVisitorTraitLangItem, // 38
81-
OpaqueStructLangItem, // 39
62+
FailFnLangItem, // 21
63+
FailBoundsCheckFnLangItem, // 22
64+
ExchangeMallocFnLangItem, // 23
65+
ClosureExchangeMallocFnLangItem, // 24
66+
ExchangeFreeFnLangItem, // 25
67+
MallocFnLangItem, // 26
68+
FreeFnLangItem, // 27
69+
BorrowAsImmFnLangItem, // 28
70+
BorrowAsMutFnLangItem, // 29
71+
ReturnToMutFnLangItem, // 30
72+
CheckNotBorrowedFnLangItem, // 31
73+
StrDupUniqFnLangItem, // 32
74+
RecordBorrowFnLangItem, // 33
75+
UnrecordBorrowFnLangItem, // 34
76+
77+
StartFnLangItem, // 35
78+
79+
TyDescStructLangItem, // 36
80+
TyVisitorTraitLangItem, // 37
81+
OpaqueStructLangItem, // 38
8282
}
8383

8484
pub struct LanguageItems {
85-
items: [Option<DefId>, ..41]
85+
items: [Option<DefId>, ..39]
8686
}
8787

8888
impl LanguageItems {
8989
pub fn new() -> LanguageItems {
9090
LanguageItems {
91-
items: [ None, ..41 ]
91+
items: [ None, ..39 ]
9292
}
9393
}
9494

@@ -122,27 +122,26 @@ impl LanguageItems {
122122

123123
19 => "str_eq",
124124
20 => "uniq_str_eq",
125-
21 => "log_type",
126-
22 => "fail_",
127-
23 => "fail_bounds_check",
128-
24 => "exchange_malloc",
129-
25 => "closure_exchange_malloc",
130-
26 => "exchange_free",
131-
27 => "malloc",
132-
28 => "free",
133-
29 => "borrow_as_imm",
134-
30 => "borrow_as_mut",
135-
31 => "return_to_mut",
136-
32 => "check_not_borrowed",
137-
33 => "strdup_uniq",
138-
34 => "record_borrow",
139-
35 => "unrecord_borrow",
140-
141-
36 => "start",
142-
143-
37 => "ty_desc",
144-
38 => "ty_visitor",
145-
39 => "opaque",
125+
21 => "fail_",
126+
22 => "fail_bounds_check",
127+
23 => "exchange_malloc",
128+
24 => "closure_exchange_malloc",
129+
25 => "exchange_free",
130+
26 => "malloc",
131+
27 => "free",
132+
28 => "borrow_as_imm",
133+
29 => "borrow_as_mut",
134+
30 => "return_to_mut",
135+
31 => "check_not_borrowed",
136+
32 => "strdup_uniq",
137+
33 => "record_borrow",
138+
34 => "unrecord_borrow",
139+
140+
35 => "start",
141+
142+
36 => "ty_desc",
143+
37 => "ty_visitor",
144+
38 => "opaque",
146145

147146
_ => "???"
148147
}

branches/try2/src/libstd/option.rs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -467,23 +467,14 @@ impl<T: Default> Option<T> {
467467
None => Default::default()
468468
}
469469
}
470-
471-
/// Returns self or `Some`-wrapped default value
472-
#[inline]
473-
pub fn or_default(self) -> Option<T> {
474-
match self {
475-
None => Some(Default::default()),
476-
x => x,
477-
}
478-
}
479470
}
480471

481472
impl<T> Default for Option<T> {
482473
#[inline]
483474
fn default() -> Option<T> { None }
484475
}
485476

486-
impl<T:Zero> Option<T> {
477+
impl<T: Zero> Option<T> {
487478
/// Returns the contained value or zero (for this type)
488479
#[inline]
489480
pub fn unwrap_or_zero(self) -> T {
@@ -492,15 +483,6 @@ impl<T:Zero> Option<T> {
492483
None => Zero::zero()
493484
}
494485
}
495-
496-
/// Returns self or `Some`-wrapped zero value
497-
#[inline]
498-
pub fn or_zero(self) -> Option<T> {
499-
match self {
500-
None => Some(Zero::zero()),
501-
x => x
502-
}
503-
}
504486
}
505487

506488
/// An iterator that yields either one or zero elements

branches/try2/src/libstd/rt/io/process.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ mod tests {
151151

152152
#[test]
153153
#[cfg(unix, not(android))]
154+
#[ignore] // FIXME(#9341)
154155
fn smoke() {
155156
let io = ~[];
156157
let args = ProcessConfig {
@@ -168,6 +169,7 @@ mod tests {
168169

169170
#[test]
170171
#[cfg(unix, not(android))]
172+
#[ignore] // FIXME(#9341)
171173
fn smoke_failure() {
172174
let io = ~[];
173175
let args = ProcessConfig {
@@ -185,6 +187,7 @@ mod tests {
185187

186188
#[test]
187189
#[cfg(unix, not(android))]
190+
#[ignore] // FIXME(#9341)
188191
fn exit_reported_right() {
189192
let io = ~[];
190193
let args = ProcessConfig {
@@ -225,6 +228,7 @@ mod tests {
225228

226229
#[test]
227230
#[cfg(unix, not(android))]
231+
#[ignore] // FIXME(#9341)
228232
fn stdout_works() {
229233
let pipe = PipeStream::new().unwrap();
230234
let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -240,6 +244,7 @@ mod tests {
240244

241245
#[test]
242246
#[cfg(unix, not(android))]
247+
#[ignore] // FIXME(#9341)
243248
fn set_cwd_works() {
244249
let pipe = PipeStream::new().unwrap();
245250
let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -256,6 +261,7 @@ mod tests {
256261

257262
#[test]
258263
#[cfg(unix, not(android))]
264+
#[ignore] // FIXME(#9341)
259265
fn stdin_works() {
260266
let input = PipeStream::new().unwrap();
261267
let output = PipeStream::new().unwrap();

branches/try2/src/libsyntax/ext/deriving/default.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ fn default_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Exp
4747
cx.ident_of("Default"),
4848
cx.ident_of("default")
4949
];
50-
let default_call = || {
51-
cx.expr_call_global(span, default_ident.clone(), ~[])
52-
};
50+
let default_call = cx.expr_call_global(span, default_ident.clone(), ~[]);
5351

5452
return match *substr.fields {
5553
StaticStruct(_, ref summary) => {
@@ -58,13 +56,13 @@ fn default_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Exp
5856
if count == 0 {
5957
cx.expr_ident(span, substr.type_ident)
6058
} else {
61-
let exprs = vec::from_fn(count, |_| default_call());
59+
let exprs = vec::from_elem(count, default_call);
6260
cx.expr_call_ident(span, substr.type_ident, exprs)
6361
}
6462
}
6563
Right(ref fields) => {
6664
let default_fields = do fields.map |ident| {
67-
cx.field_imm(span, *ident, default_call())
65+
cx.field_imm(span, *ident, default_call)
6866
};
6967
cx.expr_struct_ident(span, substr.type_ident, default_fields)
7068
}

0 commit comments

Comments
 (0)