Skip to content

Commit 083de82

Browse files
brsonbrson
committed
---
yaml --- r: 90557 b: refs/heads/master c: 4a03e04 h: refs/heads/master i: 90555: 1497cb6 v: v3
1 parent 4ae65f7 commit 083de82

File tree

372 files changed

+5865
-6720
lines changed

Some content is hidden

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

372 files changed

+5865
-6720
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b4ed6f969592595cf821bf9f72b015185a56b4f0
2+
refs/heads/master: 4a03e04755d220d71c90e989411d235d035c3164
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
55
refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

‎trunk/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

‎trunk/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"

‎trunk/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"

‎trunk/doc/rust.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ extern mod extra; // equivalent to: extern mod extra = "extra";
790790
791791
extern mod rustextra = "extra"; // linking to 'extra' under another name
792792
793-
extern mod foo = "some/where/rust-foo#foo:1.0"; // a full package ID for rustpkg
793+
extern mod foo = "some/where/foo#1.0"; // a full package ID for rustpkg
794794
~~~~
795795

796796
##### Use declarations
@@ -2177,11 +2177,7 @@ Expressions are divided into two main categories: _lvalues_ and _rvalues_.
21772177
Likewise within each expression, sub-expressions may occur in _lvalue context_ or _rvalue context_.
21782178
The evaluation of an expression depends both on its own category and the context it occurs within.
21792179

2180-
An lvalue is an expression that represents a memory location. These
2181-
expressions are [paths](#path-expressions) (which refer to local
2182-
variables, function and method arguments, or static variables),
2183-
dereferences (`*expr`), [indexing expressions](#index-expressions)
2184-
(`expr[expr]`), and [field references](#field-expressions) (`expr.f`).
2180+
[Path](#path-expressions), [field](#field-expressions) and [index](#index-expressions) expressions are lvalues.
21852181
All other expressions are rvalues.
21862182

21872183
The left operand of an [assignment](#assignment-expressions),
@@ -3329,12 +3325,6 @@ The kinds are:
33293325
This kind includes scalars, owning pointers, owned closures, and
33303326
structural types containing only other owned types.
33313327
All `Send` types are `'static`.
3332-
`Pod`
3333-
: Types of this kind consist of "Plain Old Data"
3334-
which can be copied by simply moving bits.
3335-
All values of this kind can be implicitly copied.
3336-
This kind includes scalars and immutable references,
3337-
as well as structural types containing other `Pod` types.
33383328
`'static`
33393329
: Types of this kind do not contain any borrowed pointers;
33403330
this can be a useful guarantee for code

‎trunk/doc/tutorial-ffi.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ the allocated memory. The length is less than or equal to the capacity.
7979
~~~~ {.xfail-test}
8080
pub fn validate_compressed_buffer(src: &[u8]) -> bool {
8181
unsafe {
82-
snappy_validate_compressed_buffer(src.as_ptr(), src.len() as size_t) == 0
82+
snappy_validate_compressed_buffer(vec::raw::to_ptr(src), src.len() as size_t) == 0
8383
}
8484
}
8585
~~~~
@@ -100,14 +100,14 @@ the true length after compression for setting the length.
100100
pub fn compress(src: &[u8]) -> ~[u8] {
101101
unsafe {
102102
let srclen = src.len() as size_t;
103-
let psrc = src.as_ptr();
103+
let psrc = vec::raw::to_ptr(src);
104104
105105
let mut dstlen = snappy_max_compressed_length(srclen);
106106
let mut dst = vec::with_capacity(dstlen as uint);
107-
let pdst = dst.as_mut_ptr();
107+
let pdst = vec::raw::to_mut_ptr(dst);
108108
109109
snappy_compress(psrc, srclen, pdst, &mut dstlen);
110-
dst.set_len(dstlen as uint);
110+
vec::raw::set_len(&mut dst, dstlen as uint);
111111
dst
112112
}
113113
}
@@ -120,16 +120,16 @@ format and `snappy_uncompressed_length` will retrieve the exact buffer size requ
120120
pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
121121
unsafe {
122122
let srclen = src.len() as size_t;
123-
let psrc = src.as_ptr();
123+
let psrc = vec::raw::to_ptr(src);
124124
125125
let mut dstlen: size_t = 0;
126126
snappy_uncompressed_length(psrc, srclen, &mut dstlen);
127127
128128
let mut dst = vec::with_capacity(dstlen as uint);
129-
let pdst = dst.as_mut_ptr();
129+
let pdst = vec::raw::to_mut_ptr(dst);
130130
131131
if snappy_uncompress(psrc, srclen, pdst, &mut dstlen) == 0 {
132-
dst.set_len(dstlen as uint);
132+
vec::raw::set_len(&mut dst, dstlen as uint);
133133
Some(dst)
134134
} else {
135135
None // SNAPPY_INVALID_INPUT

0 commit comments

Comments
 (0)