Skip to content

Commit 2c82787

Browse files
committed
auto merge of #5930 : osaut/rust/master, r=thestinger
Just small typos I found during my study of rust sources. I have added the fbuild URL for reader's convenience.
2 parents 938ddee + a35376e commit 2c82787

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/libstd/workcache.rs

+7-6
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
*

0 commit comments

Comments
 (0)