Skip to content

Commit f6a2484

Browse files
sanxiynsanxiyn
committed
---
yaml --- r: 65164 b: refs/heads/master c: d543354 h: refs/heads/master v: v3
1 parent 36143d1 commit f6a2484

25 files changed

+120
-159
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: 8e9eba8013490e7b6ba059397bbe73b7128c04b3
2+
refs/heads/master: d543354d6c56e8962b0c03397d43df3f16b07d03
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,7 @@ fn new_regs() -> ~Registers { ~([0, .. 32]) }
183183

184184
#[cfg(target_arch = "mips")]
185185
fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
186-
let sp = align_down(sp);
187-
// sp of mips o32 is 8-byte aligned
188-
let sp = mut_offset(sp, -2);
186+
let sp = mut_offset(sp, -1);
189187

190188
// The final return address. 0 indicates the bottom of the stack
191189
unsafe { *sp = 0; }

‎trunk/src/libcore/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use old_iter;
2222
use iterator::Iterator;
2323
use kinds::Copy;
2424
use libc;
25-
use old_iter::CopyableIter;
25+
use old_iter::{BaseIter, CopyableIter};
2626
use option::{None, Option, Some};
2727
use ptr::to_unsafe_ptr;
2828
use ptr;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,10 +1834,6 @@ pub impl Resolver {
18341834
debug!("(building import directive) bumping \
18351835
reference");
18361836
resolution.outstanding_references += 1;
1837-
1838-
// the source of this name is different now
1839-
resolution.privacy = privacy;
1840-
resolution.id = id;
18411837
}
18421838
None => {
18431839
debug!("(building import directive) creating new");

‎trunk/src/librustdoc/attr_parser.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn doc_metas(
2626
attrs: ~[ast::attribute]
2727
) -> ~[@ast::meta_item] {
2828

29-
let doc_attrs = attr::find_attrs_by_name(attrs, ~"doc");
29+
let doc_attrs = attr::find_attrs_by_name(attrs, "doc");
3030
let doc_metas = do doc_attrs.map |attr| {
3131
attr::attr_meta(attr::desugar_doc_attr(attr))
3232
};
@@ -36,7 +36,7 @@ fn doc_metas(
3636

3737
pub fn parse_crate(attrs: ~[ast::attribute]) -> CrateAttrs {
3838
let link_metas = attr::find_linkage_metas(attrs);
39-
let name = attr::last_meta_item_value_str_by_name(link_metas, ~"name");
39+
let name = attr::last_meta_item_value_str_by_name(link_metas, "name");
4040

4141
CrateAttrs {
4242
name: name.map(|s| copy **s)
@@ -58,7 +58,7 @@ pub fn parse_hidden(attrs: ~[ast::attribute]) -> bool {
5858
do doc_metas(attrs).find |meta| {
5959
match attr::get_meta_item_list(*meta) {
6060
Some(metas) => {
61-
let hiddens = attr::find_meta_items_by_name(metas, ~"hidden");
61+
let hiddens = attr::find_meta_items_by_name(metas, "hidden");
6262
!hiddens.is_empty()
6363
}
6464
None => false

‎trunk/src/librustdoc/config.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ fn opts() -> ~[(getopts::Opt, ~str)] {
7070
pub fn usage() {
7171
use core::io::println;
7272

73-
println(~"Usage: rustdoc [options] <cratefile>\n");
74-
println(~"Options:\n");
73+
println("Usage: rustdoc [options] <cratefile>\n");
74+
println("Options:\n");
7575
for opts().each |opt| {
7676
println(fmt!(" %s", opt.second()));
7777
}
78-
println(~"");
78+
println("");
7979
}
8080

8181
pub fn default_config(input_crate: &Path) -> Config {
@@ -227,7 +227,7 @@ pub fn maybe_find_pandoc(
227227
};
228228

229229
let pandoc = do vec::find(possible_pandocs) |pandoc| {
230-
let output = program_output(*pandoc, ~[~"--version"]);
230+
let output = program_output(*pandoc, [~"--version"]);
231231
debug!("testing pandoc cmd %s: %?", *pandoc, output);
232232
output.status == 0
233233
};

‎trunk/src/librustdoc/desc_to_brief_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fn first_sentence(s: ~str) -> Option<~str> {
104104
let paras = paragraphs(s);
105105
if !paras.is_empty() {
106106
let first_para = paras.head();
107-
Some(str::replace(first_sentence_(*first_para), ~"\n", ~" "))
107+
Some(str::replace(first_sentence_(*first_para), "\n", " "))
108108
} else {
109109
None
110110
}
@@ -132,7 +132,7 @@ fn first_sentence_(s: &str) -> ~str {
132132
str::to_owned(str::slice(s, 0, idx - 1))
133133
}
134134
_ => {
135-
if str::ends_with(s, ~".") {
135+
if str::ends_with(s, ".") {
136136
str::to_owned(s)
137137
} else {
138138
str::to_owned(s)

‎trunk/src/librustdoc/escape_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub fn mk_pass() -> Pass {
2020
}
2121

2222
fn escape(s: &str) -> ~str {
23-
str::replace(s, ~"\\", ~"\\\\")
23+
str::replace(s, "\\", "\\\\")
2424
}
2525

2626
#[test]

‎trunk/src/librustdoc/markdown_index_pass.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -124,33 +124,33 @@ pub fn pandoc_header_id(header: &str) -> ~str {
124124
return header;
125125
126126
fn remove_formatting(s: &str) -> ~str {
127-
str::replace(s, ~"`", ~"")
127+
str::replace(s, "`", "")
128128
}
129129
fn remove_punctuation(s: &str) -> ~str {
130-
let s = str::replace(s, ~"<", ~"");
131-
let s = str::replace(s, ~">", ~"");
132-
let s = str::replace(s, ~"[", ~"");
133-
let s = str::replace(s, ~"]", ~"");
134-
let s = str::replace(s, ~"(", ~"");
135-
let s = str::replace(s, ~")", ~"");
136-
let s = str::replace(s, ~"@~", ~"");
137-
let s = str::replace(s, ~"~", ~"");
138-
let s = str::replace(s, ~"/", ~"");
139-
let s = str::replace(s, ~":", ~"");
140-
let s = str::replace(s, ~"&", ~"");
141-
let s = str::replace(s, ~"^", ~"");
142-
let s = str::replace(s, ~",", ~"");
143-
let s = str::replace(s, ~"'", ~"");
144-
let s = str::replace(s, ~"+", ~"");
130+
let s = str::replace(s, "<", "");
131+
let s = str::replace(s, ">", "");
132+
let s = str::replace(s, "[", "");
133+
let s = str::replace(s, "]", "");
134+
let s = str::replace(s, "(", "");
135+
let s = str::replace(s, ")", "");
136+
let s = str::replace(s, "@~", "");
137+
let s = str::replace(s, "~", "");
138+
let s = str::replace(s, "/", "");
139+
let s = str::replace(s, ":", "");
140+
let s = str::replace(s, "&", "");
141+
let s = str::replace(s, "^", "");
142+
let s = str::replace(s, ",", "");
143+
let s = str::replace(s, "'", "");
144+
let s = str::replace(s, "+", "");
145145
return s;
146146
}
147147
fn replace_with_hyphens(s: &str) -> ~str {
148148
// Collapse sequences of whitespace to a single dash
149149
// XXX: Hacky implementation here that only covers
150150
// one or two spaces.
151151
let s = str::trim(s);
152-
let s = str::replace(s, ~" ", ~"-");
153-
let s = str::replace(s, ~" ", ~"-");
152+
let s = str::replace(s, " ", "-");
153+
let s = str::replace(s, " ", "-");
154154
return s;
155155
}
156156
// FIXME: #4318 Instead of to_ascii and to_str_ascii, could use

‎trunk/src/librustdoc/markdown_pass.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fn make_title(page: doc::Page) -> ~str {
110110
}
111111
};
112112
let title = markdown_pass::header_text(item);
113-
let title = str::replace(title, ~"`", ~"");
113+
let title = str::replace(title, "`", "");
114114
return title;
115115
}
116116

@@ -169,7 +169,7 @@ pub fn header_kind(doc: doc::ItemTag) -> ~str {
169169
}
170170

171171
pub fn header_name(doc: doc::ItemTag) -> ~str {
172-
let fullpath = str::connect(doc.path() + ~[doc.name()], ~"::");
172+
let fullpath = str::connect(doc.path() + ~[doc.name()], "::");
173173
match &doc {
174174
&doc::ModTag(_) if doc.id() != syntax::ast::crate_node_id => {
175175
fullpath
@@ -471,7 +471,7 @@ fn write_methods(ctxt: &Ctxt, docs: &[doc::MethodDoc]) {
471471
}
472472

473473
fn write_method(ctxt: &Ctxt, doc: doc::MethodDoc) {
474-
write_header_(ctxt, H3, header_text_(~"Method", doc.name));
474+
write_header_(ctxt, H3, header_text_("Method", doc.name));
475475
write_fnlike(
476476
ctxt,
477477
copy doc.sig,

‎trunk/src/librustdoc/markdown_writer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn pandoc_writer(
101101
use core::io::WriterUtil;
102102
103103
debug!("pandoc cmd: %s", pandoc_cmd);
104-
debug!("pandoc args: %s", str::connect(pandoc_args, ~" "));
104+
debug!("pandoc args: %s", str::connect(pandoc_args, " "));
105105

106106
let pipe_in = os::pipe();
107107
let pipe_out = os::pipe();
@@ -198,7 +198,7 @@ pub fn make_filename(
198198
}
199199
}
200200
doc::ItemPage(doc) => {
201-
str::connect(doc.path() + ~[doc.name()], ~"_")
201+
str::connect(doc.path() + ~[doc.name()], "_")
202202
}
203203
}
204204
};
@@ -213,7 +213,7 @@ pub fn make_filename(
213213
fn write_file(path: &Path, s: ~str) {
214214
use core::io::WriterUtil;
215215

216-
match io::file_writer(path, ~[io::Create, io::Truncate]) {
216+
match io::file_writer(path, [io::Create, io::Truncate]) {
217217
result::Ok(writer) => {
218218
writer.write_str(s);
219219
}

‎trunk/src/librustdoc/sectionalize_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
149149
}
150150

151151
fn parse_header(line: ~str) -> Option<~str> {
152-
if str::starts_with(line, ~"# ") {
152+
if str::starts_with(line, "# ") {
153153
Some(str::slice(line, 2u, str::len(line)).to_owned())
154154
} else {
155155
None

‎trunk/src/librustdoc/unindent_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fn unindent(s: &str) -> ~str {
8282
str::slice(*line, min_indent, str::len(*line)).to_owned()
8383
}
8484
};
85-
str::connect(unindented, ~"\n")
85+
str::connect(unindented, "\n")
8686
} else {
8787
s.to_str()
8888
}

‎trunk/src/libsyntax/ext/deriving/clone.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ pub fn expand_deriving_clone(cx: @ext_ctxt,
2121
in_items: ~[@item])
2222
-> ~[@item] {
2323
let trait_def = TraitDef {
24-
path: Path::new(~["core", "clone", "Clone"]),
24+
path: Path::new(~[~"core", ~"clone", ~"Clone"]),
2525
additional_bounds: ~[],
2626
generics: LifetimeBounds::empty(),
2727
methods: ~[
2828
MethodDef {
29-
name: "clone",
29+
name: ~"clone",
3030
generics: LifetimeBounds::empty(),
3131
explicit_self: borrowed_explicit_self(),
3232
args: ~[],
@@ -48,12 +48,12 @@ pub fn expand_deriving_deep_clone(cx: @ext_ctxt,
4848
in_items: ~[@item])
4949
-> ~[@item] {
5050
let trait_def = TraitDef {
51-
path: Path::new(~["core", "clone", "DeepClone"]),
51+
path: Path::new(~[~"core", ~"clone", ~"DeepClone"]),
5252
additional_bounds: ~[],
5353
generics: LifetimeBounds::empty(),
5454
methods: ~[
5555
MethodDef {
56-
name: "deep_clone",
56+
name: ~"deep_clone",
5757
generics: LifetimeBounds::empty(),
5858
explicit_self: borrowed_explicit_self(),
5959
args: ~[],

‎trunk/src/libsyntax/ext/deriving/cmp/eq.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ pub fn expand_deriving_eq(cx: @ext_ctxt,
3636
generics: LifetimeBounds::empty(),
3737
explicit_self: borrowed_explicit_self(),
3838
args: ~[borrowed_self()],
39-
ret_ty: Literal(Path::new(~["bool"])),
39+
ret_ty: Literal(Path::new(~[~"bool"])),
4040
const_nonmatching: true,
4141
combine_substructure: $f
4242
},
4343
}
4444
);
4545

4646
let trait_def = TraitDef {
47-
path: Path::new(~["core", "cmp", "Eq"]),
47+
path: Path::new(~[~"core", ~"cmp", ~"Eq"]),
4848
additional_bounds: ~[],
4949
generics: LifetimeBounds::empty(),
5050
methods: ~[
51-
md!("eq", cs_eq),
52-
md!("ne", cs_ne)
51+
md!(~"eq", cs_eq),
52+
md!(~"ne", cs_ne)
5353
]
5454
};
5555

‎trunk/src/libsyntax/ext/deriving/cmp/ord.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub fn expand_deriving_ord(cx: @ext_ctxt,
2626
generics: LifetimeBounds::empty(),
2727
explicit_self: borrowed_explicit_self(),
2828
args: ~[borrowed_self()],
29-
ret_ty: Literal(Path::new(~["bool"])),
29+
ret_ty: Literal(Path::new(~[~"bool"])),
3030
const_nonmatching: false,
3131
combine_substructure: |cx, span, substr|
3232
cs_ord($less, $equal, cx, span, substr)
@@ -37,15 +37,15 @@ pub fn expand_deriving_ord(cx: @ext_ctxt,
3737

3838

3939
let trait_def = TraitDef {
40-
path: Path::new(~["core", "cmp", "Ord"]),
40+
path: Path::new(~[~"core", ~"cmp", ~"Ord"]),
4141
// XXX: Ord doesn't imply Eq yet
42-
additional_bounds: ~[Literal(Path::new(~["core", "cmp", "Eq"]))],
42+
additional_bounds: ~[Literal(Path::new(~[~"core", ~"cmp", ~"Eq"]))],
4343
generics: LifetimeBounds::empty(),
4444
methods: ~[
45-
md!("lt", true, false),
46-
md!("le", true, true),
47-
md!("gt", false, false),
48-
md!("ge", false, true)
45+
md!(~"lt", true, false),
46+
md!(~"le", true, true),
47+
md!(~"gt", false, false),
48+
md!(~"ge", false, true)
4949
]
5050
};
5151

‎trunk/src/libsyntax/ext/deriving/cmp/totaleq.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ pub fn expand_deriving_totaleq(cx: @ext_ctxt,
2626
}
2727

2828
let trait_def = TraitDef {
29-
path: Path::new(~["core", "cmp", "TotalEq"]),
29+
path: Path::new(~[~"core", ~"cmp", ~"TotalEq"]),
3030
additional_bounds: ~[],
3131
generics: LifetimeBounds::empty(),
3232
methods: ~[
3333
MethodDef {
34-
name: "equals",
34+
name: ~"equals",
3535
generics: LifetimeBounds::empty(),
3636
explicit_self: borrowed_explicit_self(),
3737
args: ~[borrowed_self()],
38-
ret_ty: Literal(Path::new(~["bool"])),
38+
ret_ty: Literal(Path::new(~[~"bool"])),
3939
const_nonmatching: true,
4040
combine_substructure: cs_equals
4141
}

‎trunk/src/libsyntax/ext/deriving/cmp/totalord.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ pub fn expand_deriving_totalord(cx: @ext_ctxt,
2020
mitem: @meta_item,
2121
in_items: ~[@item]) -> ~[@item] {
2222
let trait_def = TraitDef {
23-
path: Path::new(~["core", "cmp", "TotalOrd"]),
23+
path: Path::new(~[~"core", ~"cmp", ~"TotalOrd"]),
2424
additional_bounds: ~[],
2525
generics: LifetimeBounds::empty(),
2626
methods: ~[
2727
MethodDef {
28-
name: "cmp",
28+
name: ~"cmp",
2929
generics: LifetimeBounds::empty(),
3030
explicit_self: borrowed_explicit_self(),
3131
args: ~[borrowed_self()],
32-
ret_ty: Literal(Path::new(~["core", "cmp", "Ordering"])),
32+
ret_ty: Literal(Path::new(~[~"core", ~"cmp", ~"Ordering"])),
3333
const_nonmatching: false,
3434
combine_substructure: cs_cmp
3535
}

0 commit comments

Comments
 (0)