Skip to content

Commit 306f653

Browse files
g3xzhg3xzh
committed
---
yaml --- r: 147342 b: refs/heads/try2 c: 05395cb h: refs/heads/master v: v3
1 parent 32adabf commit 306f653

File tree

684 files changed

+9916
-13201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

684 files changed

+9916
-13201
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 3c2c13bae4783c808f6640286d41cba6d9394dd9
8+
refs/heads/try2: 05395cba88580db10455952706cd8ae292fdbbe7
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/configure

Lines changed: 12 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,8 @@ then
469469
PV_MINOR=${PV_MAJOR_MINOR#* }
470470
if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
471471
then
472-
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
473-
BAD_PANDOC=1
472+
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
473+
BAD_PANDOC=1
474474
fi
475475
fi
476476

@@ -544,45 +544,12 @@ then
544544
putvar CFG_ENABLE_CLANG
545545
fi
546546

547+
547548
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
548549
then
549550
err "either clang or gcc is required"
550551
fi
551552

552-
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
553-
# system, so if we find that gcc is clang, we should just use clang directly.
554-
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
555-
then
556-
CFG_OSX_GCC_VERSION=$("$CFG_GCC" --version 2>&1 | grep "Apple LLVM version")
557-
if [ $? -eq 0 ]
558-
then
559-
step_msg "on OS X 10.9, forcing use of clang"
560-
CFG_ENABLE_CLANG=1
561-
putvar CFG_ENABLE_CLANG
562-
else
563-
# on OS X, with xcode 5 and newer, certain developers may have
564-
# cc, gcc and g++ point to a mixture of clang and gcc
565-
# if so, this will create very strange build errors
566-
# this last stanza is to detect some such problems and save the future rust
567-
# contributor some time solving that issue.
568-
# this detection could be generalized to other OSes aside from OS X
569-
# but the issue seems most likely to happen on OS X
570-
571-
chk_cc () {
572-
$1 --version 2> /dev/null | grep -q $2
573-
}
574-
# check that gcc, cc and g++ all point to the same compiler.
575-
# note that for xcode 5, g++ points to clang, not clang++
576-
if !((chk_cc gcc clang && chk_cc g++ clang) ||
577-
(chk_cc gcc gcc &&( chk_cc g++ g++ || chk g++ gcc))) then
578-
err "the gcc and g++ in your path point to different compilers.
579-
Check which versions are in your path with cc --version and g++ --version.
580-
To resolve this problem, either fix your PATH or run configure with --enable-clang"
581-
fi
582-
583-
fi
584-
fi
585-
586553
if [ ! -z "$CFG_LLVM_ROOT" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ]
587554
then
588555
step_msg "using custom LLVM at $CFG_LLVM_ROOT"
@@ -591,20 +558,20 @@ then
591558
LLVM_VERSION=$($LLVM_CONFIG --version)
592559

593560
case $LLVM_VERSION in
594-
(3.3|3.3svn|3.2|3.2svn)
595-
msg "found ok version of LLVM: $LLVM_VERSION"
596-
;;
597-
(*)
598-
err "bad LLVM version: $LLVM_VERSION, need >=3.0svn"
599-
;;
561+
(3.3|3.3svn|3.2|3.2svn)
562+
msg "found ok version of LLVM: $LLVM_VERSION"
563+
;;
564+
(*)
565+
err "bad LLVM version: $LLVM_VERSION, need >=3.0svn"
566+
;;
600567
esac
601568
fi
602569

603570
if [ ! -z "$CFG_ENABLE_CLANG" ]
604571
then
605572
if [ -z "$CFG_CLANG" ]
606573
then
607-
err "clang requested but not found"
574+
err "clang requested but not found"
608575
fi
609576
CFG_CLANG_VERSION=$("$CFG_CLANG" \
610577
--version \
@@ -910,11 +877,9 @@ do
910877
# Try to have LLVM pull in as few dependencies as possible (#9397)
911878
LLVM_OPTS="$LLVM_OPTS --disable-zlib --disable-libffi"
912879

913-
# Use win32 native thread/lock apis instead of pthread wrapper.
914-
# (llvm's configure tries to find pthread first, so we have to disable it explicitly.)
915-
# Also note that pthreads works badly on mingw-w64 systems: #8996
880+
# pthreads works badly on mingw-w64 systems: #8996
916881
case "$CFG_BUILD" in
917-
(*-mingw32)
882+
(*w64-mingw32)
918883
LLVM_OPTS="$LLVM_OPTS --disable-pthreads"
919884
;;
920885
esac

‎branches/try2/doc/manual.inc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
padding-left: 2em;
66
}
77
#influences blockquote p:last-child {
8-
color: #999;
8+
display: block;
9+
line-height: 1.428571429;
10+
color: #999999;
911
}
10-
</style>
12+
</style>

‎branches/try2/doc/po/ja/tutorial-ffi.md.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ msgid ""
168168
"~~~~ {.xfail-test}\n"
169169
"pub fn validate_compressed_buffer(src: &[u8]) -> bool {\n"
170170
" unsafe {\n"
171-
" snappy_validate_compressed_buffer(src.as_ptr(), src.len() as size_t) == 0\n"
171+
" snappy_validate_compressed_buffer(vec::raw::to_ptr(src), src.len() as size_t) == 0\n"
172172
" }\n"
173173
"}\n"
174174
"~~~~\n"
@@ -207,7 +207,7 @@ msgid ""
207207
"pub fn compress(src: &[u8]) -> ~[u8] {\n"
208208
" unsafe {\n"
209209
" let srclen = src.len() as size_t;\n"
210-
" let psrc = src.as_ptr();\n"
210+
" let psrc = vec::raw::to_ptr(src);\n"
211211
msgstr ""
212212

213213
#. type: Plain text
@@ -216,15 +216,15 @@ msgstr ""
216216
msgid ""
217217
" let mut dstlen = snappy_max_compressed_length(srclen);\n"
218218
" let mut dst = vec::with_capacity(dstlen as uint);\n"
219-
" let pdst = dst.as_mut_ptr();\n"
219+
" let pdst = vec::raw::to_mut_ptr(dst);\n"
220220
msgstr ""
221221

222222
#. type: Plain text
223223
#: doc/tutorial-ffi.md:113
224224
#, no-wrap
225225
msgid ""
226226
" snappy_compress(psrc, srclen, pdst, &mut dstlen);\n"
227-
" dst.set_len(dstlen as uint);\n"
227+
" vec::raw::set_len(&mut dst, dstlen as uint);\n"
228228
" dst\n"
229229
" }\n"
230230
"}\n"
@@ -247,7 +247,7 @@ msgid ""
247247
"pub fn uncompress(src: &[u8]) -> Option<~[u8]> {\n"
248248
" unsafe {\n"
249249
" let srclen = src.len() as size_t;\n"
250-
" let psrc = src.as_ptr();\n"
250+
" let psrc = vec::raw::to_ptr(src);\n"
251251
msgstr ""
252252

253253
#. type: Plain text
@@ -263,15 +263,15 @@ msgstr ""
263263
#, no-wrap
264264
msgid ""
265265
" let mut dst = vec::with_capacity(dstlen as uint);\n"
266-
" let pdst = dst.as_mut_ptr();\n"
266+
" let pdst = vec::raw::to_mut_ptr(dst);\n"
267267
msgstr ""
268268

269269
#. type: Plain text
270270
#: doc/tutorial-ffi.md:138
271271
#, no-wrap
272272
msgid ""
273273
" if snappy_uncompress(psrc, srclen, pdst, &mut dstlen) == 0 {\n"
274-
" dst.set_len(dstlen as uint);\n"
274+
" vec::raw::set_len(&mut dst, dstlen as uint);\n"
275275
" Some(dst)\n"
276276
" } else {\n"
277277
" None // SNAPPY_INVALID_INPUT\n"

‎branches/try2/doc/po/tutorial-ffi.md.pot

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ msgid ""
168168
"~~~~ {.xfail-test}\n"
169169
"pub fn validate_compressed_buffer(src: &[u8]) -> bool {\n"
170170
" unsafe {\n"
171-
" snappy_validate_compressed_buffer(src.as_ptr(), src.len() as size_t) == 0\n"
171+
" snappy_validate_compressed_buffer(vec::raw::to_ptr(src), src.len() as size_t) == 0\n"
172172
" }\n"
173173
"}\n"
174174
"~~~~\n"
@@ -207,7 +207,7 @@ msgid ""
207207
"pub fn compress(src: &[u8]) -> ~[u8] {\n"
208208
" unsafe {\n"
209209
" let srclen = src.len() as size_t;\n"
210-
" let psrc = src.as_ptr();\n"
210+
" let psrc = vec::raw::to_ptr(src);\n"
211211
msgstr ""
212212

213213
#. type: Plain text
@@ -216,15 +216,15 @@ msgstr ""
216216
msgid ""
217217
" let mut dstlen = snappy_max_compressed_length(srclen);\n"
218218
" let mut dst = vec::with_capacity(dstlen as uint);\n"
219-
" let pdst = dst.as_mut_ptr();\n"
219+
" let pdst = vec::raw::to_mut_ptr(dst);\n"
220220
msgstr ""
221221

222222
#. type: Plain text
223223
#: doc/tutorial-ffi.md:113
224224
#, no-wrap
225225
msgid ""
226226
" snappy_compress(psrc, srclen, pdst, &mut dstlen);\n"
227-
" dst.set_len(dstlen as uint);\n"
227+
" vec::raw::set_len(&mut dst, dstlen as uint);\n"
228228
" dst\n"
229229
" }\n"
230230
"}\n"
@@ -247,7 +247,7 @@ msgid ""
247247
"pub fn uncompress(src: &[u8]) -> Option<~[u8]> {\n"
248248
" unsafe {\n"
249249
" let srclen = src.len() as size_t;\n"
250-
" let psrc = src.as_ptr();\n"
250+
" let psrc = vec::raw::to_ptr(src);\n"
251251
msgstr ""
252252

253253
#. type: Plain text
@@ -263,15 +263,15 @@ msgstr ""
263263
#, no-wrap
264264
msgid ""
265265
" let mut dst = vec::with_capacity(dstlen as uint);\n"
266-
" let pdst = dst.as_mut_ptr();\n"
266+
" let pdst = vec::raw::to_mut_ptr(dst);\n"
267267
msgstr ""
268268

269269
#. type: Plain text
270270
#: doc/tutorial-ffi.md:138
271271
#, no-wrap
272272
msgid ""
273273
" if snappy_uncompress(psrc, srclen, pdst, &mut dstlen) == 0 {\n"
274-
" dst.set_len(dstlen as uint);\n"
274+
" vec::raw::set_len(&mut dst, dstlen as uint);\n"
275275
" Some(dst)\n"
276276
" } else {\n"
277277
" None // SNAPPY_INVALID_INPUT\n"

0 commit comments

Comments
 (0)