Skip to content

Commit b01c862

Browse files
committed
---
yaml --- r: 3897 b: refs/heads/master c: 39151f2 h: refs/heads/master i: 3895: 4ca980e v: v3
1 parent 412fc9a commit b01c862

File tree

106 files changed

+394
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+394
-391
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 04b239f3cb9d4b62488dc2d219e9bd9a242bdf8f
2+
refs/heads/master: 39151f2ad8d18554af1d6787bae0b02345e1d90b

trunk/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ include $(CFG_SRC_DIR)/mk/docs.mk
257257
ifneq ($(strip $(findstring dist,$(MAKECMDGOALS)) \
258258
$(findstring check,$(MAKECMDGOALS)) \
259259
$(findstring test,$(MAKECMDGOALS)) \
260+
$(findstring tidy,$(MAKECMDGOALS)) \
260261
$(findstring clean,$(MAKECMDGOALS))),)
261262
CFG_INFO := $(info cfg: including dist rules)
262263
include $(CFG_SRC_DIR)/mk/dist.mk

trunk/src/comp/back/link.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ fn build_link_meta(&session::session sess, &ast::crate c,
325325
fn len_and_str_lit(&ast::lit l) -> str {
326326
ret len_and_str(pprust::lit_to_str(@l));
327327
}
328-
328+
329329
auto cmh_items = attr::sort_meta_items(metas.cmh_items);
330330

331331
sha.reset();

trunk/src/comp/front/attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ fn require_unique_names(&session::session sess, &(@ast::meta_item)[] metas) {
199199
for (@ast::meta_item meta in metas) {
200200
auto name = get_meta_item_name(meta);
201201
if (map.contains_key(name)) {
202-
sess.span_fatal(meta.span,
202+
sess.span_fatal(meta.span,
203203
#fmt("duplicate meta item `%s`", name));
204204
}
205205
map.insert(name, ());

trunk/src/comp/front/test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fn fold_item(&test_ctxt cx, &@ast::item i,
9898
}
9999

100100
fn is_test_fn(&@ast::item i) -> bool {
101-
auto has_test_attr =
101+
auto has_test_attr =
102102
ivec::len(attr::find_attrs_by_name(i.attrs, "test")) > 0u;
103103

104104
fn has_test_signature(&@ast::item i) -> bool {
@@ -173,7 +173,7 @@ fn mk_tests(&test_ctxt cx) -> @ast::item {
173173
cf = ast::return,
174174
constraints = ~[]);
175175
auto proto = ast::proto_fn;
176-
176+
177177
// The vector of test_descs for this crate
178178
auto test_descs = mk_test_desc_vec(cx);
179179

@@ -352,7 +352,7 @@ fn mk_test_main_call(&test_ctxt cx) -> @ast::expr {
352352
node = test_main_path_expr_,
353353
span = rec(lo=0u, hi=0u));
354354

355-
let ast::expr_ test_main_call_expr_
355+
let ast::expr_ test_main_call_expr_
356356
= ast::expr_call(@test_main_path_expr, ~[@args_path_expr,
357357
@test_call_expr]);
358358

trunk/src/comp/lib/llvm.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ native mod llvm = "rustllvm" {
889889
* BuilderRef B into place. A BuilderRef is a cursor-like LLVM value that
890890
* inserts instructions for a particular BasicBlockRef at a particular
891891
* position; for our purposes, it always inserts at the end of the basic block
892-
* it's attached to.
892+
* it's attached to.
893893
*/
894894

895895
// FIXME: Do we want to support mutable object fields?
@@ -1524,9 +1524,9 @@ fn type_to_str_inner(type_names names, &TypeRef[] outer0, TypeRef ty) -> str {
15241524
ret s;
15251525
}
15261526

1527-
case (10) {
1527+
case (10) {
15281528
auto el_ty = llvm::LLVMGetElementType(ty);
1529-
ret "[" + type_to_str_inner(names, outer, el_ty) + "]";
1529+
ret "[" + type_to_str_inner(names, outer, el_ty) + "]";
15301530
}
15311531

15321532
case (11) {

trunk/src/comp/metadata/tyencode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ fn enc_constr(&io::writer w, &@ctxt cx, &@ty::constr_def c) {
236236
if (semi) { w.write_char(';'); } else { semi = true; }
237237
alt (a.node) {
238238
case (carg_base) { w.write_char('*'); }
239-
case (carg_ident(?i)) {
239+
case (carg_ident(?i)) {
240240
w.write_uint(i);
241241
}
242242
case (carg_lit(?l)) { w.write_str(lit_to_str(l)); }

trunk/src/comp/middle/resolve.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn map_crate(&@env e, &@ast::crate c) {
156156
with *visit::default_visitor[scopes]());
157157
visit::visit_crate(*c, cons(scope_crate, @nil),
158158
visit::mk_vt(v_map_mod));
159-
// Register the top-level mod
159+
// Register the top-level mod
160160

161161
e.mod_map.insert(-1,
162162
@rec(m=some(c.node.module),
@@ -342,7 +342,7 @@ fn visit_fn_with_scope(&@env e, &ast::_fn f, &ast::ty_param[] tp, &span sp,
342342
// for f's constrs in the table.
343343

344344
for (@ast::constr c in f.decl.constraints) {
345-
resolve_constr(e, id, c, sc, v);
345+
resolve_constr(e, id, c, sc, v);
346346
}
347347
visit::visit_fn(f, tp, sp, name, id,
348348
cons(scope_fn(f.decl, tp), @sc), v);
@@ -1294,7 +1294,7 @@ fn check_arm(@env e, &ast::arm a, &() x, &vt[()] v) {
12941294
// Fight the alias checker
12951295
auto name_ = name;
12961296
e.sess.span_err
1297-
(a.pats.(i).span, "binding " + name_ +
1297+
(a.pats.(i).span, "binding " + name_ +
12981298
" does not occur in first pattern");
12991299
}
13001300
}

0 commit comments

Comments
 (0)