Skip to content

Commit 96a9814

Browse files
committed
---
yaml --- r: 13950 b: refs/heads/try c: 11ecec1 h: refs/heads/master v: v3
1 parent ab7fca4 commit 96a9814

16 files changed

+552
-913
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: f9f938887470cbc2490d1b991ffec8713470d565
5+
refs/heads/try: 11ecec1b716aa430f80cc18cf850336a990c2850
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/core.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This behavior can be disabled with the `no_core` crate attribute."
3030

3131
export box, char, float, bessel, f32, f64, int, str, ptr;
3232
export uint, u8, u32, u64, vec, bool;
33-
export either, option, result, iter;
33+
export either, option, result;
3434
export ctypes, sys, unsafe, comm, task, logging;
3535
export extfmt;
3636
export math;
@@ -64,7 +64,7 @@ mod either;
6464
mod option;
6565
mod result;
6666
mod tuple;
67-
mod iter;
67+
6868

6969
// Runtime and language-primitive support
7070

branches/try/src/libcore/iter.rs

Lines changed: 0 additions & 171 deletions
This file was deleted.

branches/try/src/rustdoc/attr_parser.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import core::tuple;
1111

1212
export crate_attrs, mod_attrs, fn_attrs, arg_attrs,
1313
const_attrs, enum_attrs, variant_attrs, res_attrs,
14-
iface_attrs, method_attrs, impl_attrs;
14+
iface_attrs, method_attrs;
1515
export parse_crate, parse_mod, parse_fn, parse_const,
1616
parse_enum, parse_variant, parse_res,
17-
parse_iface, parse_method, parse_impl;
17+
parse_iface, parse_method;
1818

1919
type crate_attrs = {
2020
name: option<str>
@@ -63,11 +63,6 @@ type iface_attrs = {
6363
desc: option<str>
6464
};
6565

66-
type impl_attrs = {
67-
brief: option<str>,
68-
desc: option<str>
69-
};
70-
7166
type method_attrs = fn_attrs;
7267

7368
#[cfg(test)]
@@ -504,7 +499,3 @@ fn parse_iface(attrs: [ast::attribute]) -> iface_attrs {
504499
fn parse_method(attrs: [ast::attribute]) -> method_attrs {
505500
parse_fn(attrs)
506501
}
507-
508-
fn parse_impl(attrs: [ast::attribute]) -> impl_attrs {
509-
parse_basic(attrs)
510-
}

0 commit comments

Comments
 (0)