File tree Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 2815328e41e0901574cc023fd6aeec4b151635ab
2
+ refs/heads/master: dcc88699d8f36ab35cf6b498d9d924526432db26
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5
5
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
Original file line number Diff line number Diff line change @@ -41,6 +41,9 @@ Version 0.6 (March 2013)
41
41
* Pattern matching over vectors improved and expanded
42
42
* `const` renamed to `static` to correspond to lifetime name,
43
43
and make room for future `static mut` unsafe mutable globals.
44
+ * Replaced `#[deriving_eq]` with `#[deriving(Eq)]`
45
+ * `Clone` implementations can be automatically generated with
46
+ `#[deriving(Clone)]`
44
47
45
48
* Semantic changes
46
49
* Types with owned pointers or custom destructors move by default,
Original file line number Diff line number Diff line change 444
444
445
445
if [ ! -z " $CFG_PANDOC " ]
446
446
then
447
- PV_MAJOR_MINOR=$( pandoc --version | grep ' ^pandoc ' |
448
- # extract the first 2 version fields, ignore everything else
449
- sed ' s/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/' )
450
-
451
- # these patterns are shell globs, *not* regexps
452
- PV_MAJOR=${PV_MAJOR_MINOR% * }
453
- PV_MINOR=${PV_MAJOR_MINOR#* }
447
+ PANDOC_VER_LINE=$( pandoc --version | grep ' ^pandoc ' )
448
+ PANDOC_VER=${PANDOC_VER_LINE# pandoc }
449
+ PV_MAJOR_MINOR=${PANDOC_VER% .[0-9]* }
450
+ PV_MAJOR=${PV_MAJOR_MINOR%% [.][0-9]* }
451
+ PV_MINOR=${PV_MAJOR_MINOR# [0-9]* [.]}
452
+ PV_MINOR=${PV_MINOR%% [.][0-9]* }
454
453
if [ " $PV_MAJOR " -lt " 1" ] || [ " $PV_MINOR " -lt " 8" ]
455
454
then
456
455
step_msg " pandoc $PV_MAJOR .$PV_MINOR is too old. disabling"
You can’t perform that action at this time.
0 commit comments