Skip to content

Commit dc1c090

Browse files
committed
---
yaml --- r: 60852 b: refs/heads/auto c: 9bfe296 h: refs/heads/master v: v3
1 parent 0002820 commit dc1c090

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
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: 220e1a6cfc0b44ee04b38e5373ca9d2b4eb12963
17+
refs/heads/auto: 9bfe296eb720e56803126a5c639b713f9032298b
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,13 @@ then
970970
putvar CFG_CCACHE_CPP2
971971
fi
972972

973+
if [ ! -z "$CFG_ENABLE_CCACHE" ]
974+
then
975+
CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
976+
putvar CFG_CCACHE_BASEDIR
977+
fi
978+
979+
973980
if [ ! -z $BAD_PANDOC ]
974981
then
975982
CFG_PANDOC=

branches/auto/mk/platform.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,11 @@ ifeq ($(CFG_CCACHE_CPP2),1)
396396
export CCACHE_CPP
397397
endif
398398

399+
ifdef CFG_CCACHE_BASEDIR
400+
CCACHE_BASEDIR=$(CFG_CCACHE_BASEDIR)
401+
export CCACHE_BASEDIR
402+
endif
403+
399404
define CFG_MAKE_TOOLCHAIN
400405
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
401406
$$(CFG_GCCISH_CFLAGS) \

branches/auto/src/libstd/num/uint_macros.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,9 @@ pub fn ge(x: $T, y: $T) -> bool { x >= y }
6464
pub fn gt(x: $T, y: $T) -> bool { x > y }
6565

6666
#[inline(always)]
67-
/**
68-
* Iterate through a range with a given step value.
69-
*
70-
* # Examples
71-
* ~~~ {.rust}
72-
* let nums = [1,2,3,4,5,6,7];
73-
*
74-
* for uint::range_step(0, nums.len() - 1, 2) |i| {
75-
* println(fmt!("%d & %d", nums[i], nums[i+1]));
76-
* }
77-
* ~~~
78-
*/
67+
///
68+
/// Iterate over the range [`start`,`start`+`step`..`stop`)
69+
///
7970
pub fn range_step(start: $T, stop: $T, step: $T_SIGNED, it: &fn($T) -> bool) -> bool {
8071
let mut i = start;
8172
if step == 0 {

0 commit comments

Comments
 (0)