Skip to content

Commit d9e312b

Browse files
author
Olivier Saut
committed
---
yaml --- r: 56207 b: refs/heads/auto c: a35376e h: refs/heads/master i: 56205: bbf497f 56203: 1ec531e 56199: 277d780 56191: e31a9c2 v: v3
1 parent 367317d commit d9e312b

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 5dda8ab12999d6f434a6d5f3746b48b757acb7b7
17+
refs/heads/auto: a35376e24ec28d79f4e29ec34061ba23353c3d57
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/workcache.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -30,11 +30,12 @@ use core::to_bytes;
3030

3131
/**
3232
*
33-
* This is a loose clone of the fbuild build system, made a touch more
34-
* generic (not wired to special cases on files) and much less metaprogram-y
35-
* due to rust's comparative weakness there, relative to python.
33+
* This is a loose clone of the [fbuild build system](https://github.com/felix-lang/fbuild),
34+
* made a touch more generic (not wired to special cases on files) and much
35+
* less metaprogram-y due to rust's comparative weakness there, relative to
36+
* python.
3637
*
37-
* It's based around _imperative bulids_ that happen to have some function
38+
* It's based around _imperative builds_ that happen to have some function
3839
* calls cached. That is, it's _just_ a mechanism for describing cached
3940
* functions. This makes it much simpler and smaller than a "build system"
4041
* that produces an IR and evaluates it. The evaluation order is normal
@@ -54,7 +55,7 @@ use core::to_bytes;
5455
* Works are conceptually single units, but we store them most of the time
5556
* in maps of the form (type,name) => value. These are WorkMaps.
5657
*
57-
* A cached function divides the works it's interested up into inputs and
58+
* A cached function divides the works it's interested in into inputs and
5859
* outputs, and subdivides those into declared (input) works and
5960
* discovered (input and output) works.
6061
*

branches/auto/src/rt/rust_exchange_alloc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ rust_get_exchange_count_ptr() {
4848
void
4949
rust_check_exchange_count_on_exit() {
5050
if (exchange_count != 0) {
51-
printf("exchange heap not empty on exit\n");
52-
printf("%d dangling allocations\n", (int)exchange_count);
51+
printf("exchange heap not empty on on exit");
52+
printf("%d dangling allocations", (int)exchange_count);
5353
abort();
5454
}
5555
}

0 commit comments

Comments
 (0)