Skip to content

Commit 1f0b90d

Browse files
committed
---
yaml --- r: 62869 b: refs/heads/snap-stage3 c: 9bfe296 h: refs/heads/master i: 62867: 8d7d62e v: v3
1 parent fd51181 commit 1f0b90d

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 220e1a6cfc0b44ee04b38e5373ca9d2b4eb12963
4+
refs/heads/snap-stage3: 9bfe296eb720e56803126a5c639b713f9032298b
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/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/snap-stage3/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)