Skip to content

Commit e5cf945

Browse files
borsbors
committed
---
yaml --- r: 274099 b: refs/heads/stable c: 4bb9d45 h: refs/heads/master i: 274097: 2d6f94c 274095: 4a13285
1 parent 9e082ef commit e5cf945

File tree

311 files changed

+7989
-6984
lines changed

Some content is hidden

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

311 files changed

+7989
-6984
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 8877cca190b4ddf3386092fa3bb84431b9d6cabd
32+
refs/heads/stable: 4bb9d453cf9640b08d97543cd5ed9ded52fd757f
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ build.
7878
Download [MinGW from
7979
here](http://mingw-w64.org/doku.php/download/mingw-builds), and choose the
8080
`threads=win32,exceptions=dwarf/seh` flavor when installing. After installing,
81-
add its `bin` directory to your `PATH`. This is due to #28260, in the future,
81+
add its `bin` directory to your `PATH`. This is due to [#28260](https://github.com/rust-lang/rust/issues/28260), in the future,
8282
installing from pacman should be just fine.
8383
8484
```

‎branches/stable/configure

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ CFG_SELF="$0"
550550
CFG_CONFIGURE_ARGS="$@"
551551

552552

553-
case "${CFG_SRC_DIR}" in
553+
case "${CFG_SRC_DIR}" in
554554
*\ * )
555555
err "The path to the rust source directory contains spaces, which is not supported"
556556
;;
@@ -892,6 +892,13 @@ then
892892
CFG_DISABLE_JEMALLOC=1
893893
fi
894894

895+
if [ $CFG_OSTYPE = pc-windows-gnu ]
896+
then
897+
# FIXME(#31030) - there's not a great reason to disable jemalloc here
898+
step_msg "on Windows, disabling jemalloc"
899+
CFG_DISABLE_JEMALLOC=1
900+
fi
901+
895902
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
896903
# system, so if we find that gcc is clang, we should just use clang directly.
897904
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
@@ -1035,7 +1042,7 @@ then
10351042
if [ -n "$CFG_OSX_CLANG_VERSION" ]
10361043
then
10371044
case $CFG_OSX_CLANG_VERSION in
1038-
(7.0*)
1045+
(7.0* | 7.1* | 7.2*)
10391046
step_msg "found ok version of APPLE CLANG: $CFG_OSX_CLANG_VERSION"
10401047
;;
10411048
(*)

‎branches/stable/mk/crates.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ TARGET_CRATES := libc std flate arena term \
5757
RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_driver \
5858
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
5959
rustc_data_structures rustc_front rustc_platform_intrinsics \
60-
rustc_plugin rustc_metadata
60+
rustc_plugin rustc_metadata rustc_passes
6161
HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros
6262
TOOLS := compiletest rustdoc rustc rustbook error-index-generator
6363

@@ -97,11 +97,12 @@ DEPS_rustc_data_structures := std log serialize
9797
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
9898
rustc_typeck rustc_mir rustc_resolve log syntax serialize rustc_llvm \
9999
rustc_trans rustc_privacy rustc_lint rustc_front rustc_plugin \
100-
rustc_metadata syntax_ext
100+
rustc_metadata syntax_ext rustc_passes
101101
DEPS_rustc_front := std syntax log serialize
102102
DEPS_rustc_lint := rustc log syntax
103103
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
104104
DEPS_rustc_metadata := rustc rustc_front syntax rbml
105+
DEPS_rustc_passes := syntax rustc core
105106
DEPS_rustc_mir := rustc rustc_front syntax
106107
DEPS_rustc_resolve := arena rustc rustc_front log syntax
107108
DEPS_rustc_platform_intrinsics := rustc rustc_llvm

‎branches/stable/src/doc/book/ffi.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,8 @@ are:
478478
* `aapcs`
479479
* `cdecl`
480480
* `fastcall`
481+
* `vectorcall`
482+
This is currently hidden behind the `abi_vectorcall` gate and is subject to change.
481483
* `Rust`
482484
* `rust-intrinsic`
483485
* `system`

‎branches/stable/src/doc/book/lifetimes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ fn frob<'a, 'b>(s: &'a str, t: &'b str) -> &str; // Expanded: Output lifetime is
353353
fn get_mut(&mut self) -> &mut T; // elided
354354
fn get_mut<'a>(&'a mut self) -> &'a mut T; // expanded
355355
356-
fn args<T:ToCStr>(&mut self, args: &[T]) -> &mut Command; // elided
357-
fn args<'a, 'b, T:ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command; // expanded
356+
fn args<T: ToCStr>(&mut self, args: &[T]) -> &mut Command; // elided
357+
fn args<'a, 'b, T: ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command; // expanded
358358
359359
fn new(buf: &mut [u8]) -> BufWriter; // elided
360360
fn new<'a>(buf: &'a mut [u8]) -> BufWriter<'a>; // expanded

‎branches/stable/src/doc/book/macros.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,11 @@ This expands to
285285

286286
```text
287287
const char *state = "reticulating splines";
288-
int state = get_log_state();
289-
if (state > 0) {
290-
printf("log(%d): %s\n", state, state);
288+
{
289+
int state = get_log_state();
290+
if (state > 0) {
291+
printf("log(%d): %s\n", state, state);
292+
}
291293
}
292294
```
293295

‎branches/stable/src/doc/nomicon/lifetime-elision.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ fn frob(s: &str, t: &str) -> &str; // ILLEGAL
5555
fn get_mut(&mut self) -> &mut T; // elided
5656
fn get_mut<'a>(&'a mut self) -> &'a mut T; // expanded
5757
58-
fn args<T:ToCStr>(&mut self, args: &[T]) -> &mut Command // elided
59-
fn args<'a, 'b, T:ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command // expanded
58+
fn args<T: ToCStr>(&mut self, args: &[T]) -> &mut Command // elided
59+
fn args<'a, 'b, T: ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command // expanded
6060
6161
fn new(buf: &mut [u8]) -> BufWriter; // elided
6262
fn new<'a>(buf: &'a mut [u8]) -> BufWriter<'a> // expanded

‎branches/stable/src/doc/nomicon/vec-final.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,11 @@ impl<T> Iterator for RawValIter<T> {
226226
} else {
227227
unsafe {
228228
let result = ptr::read(self.start);
229-
self.start = self.start.offset(1);
229+
self.start = if mem::size_of::<T>() == 0 {
230+
(self.start as usize + 1) as *const _
231+
} else {
232+
self.start.offset(1)
233+
};
230234
Some(result)
231235
}
232236
}
@@ -246,7 +250,11 @@ impl<T> DoubleEndedIterator for RawValIter<T> {
246250
None
247251
} else {
248252
unsafe {
249-
self.end = self.end.offset(-1);
253+
self.end = if mem::size_of::<T>() == 0 {
254+
(self.end as usize - 1) as *const _
255+
} else {
256+
self.end.offset(-1)
257+
};
250258
Some(ptr::read(self.end))
251259
}
252260
}

‎branches/stable/src/doc/nomicon/vec-zsts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ impl<T> Iterator for RawValIter<T> {
140140
self.start = if mem::size_of::<T>() == 0 {
141141
(self.start as usize + 1) as *const _
142142
} else {
143-
self.start.offset(1);
144-
}
143+
self.start.offset(1)
144+
};
145145
Some(result)
146146
}
147147
}
@@ -164,8 +164,8 @@ impl<T> DoubleEndedIterator for RawValIter<T> {
164164
self.end = if mem::size_of::<T>() == 0 {
165165
(self.end as usize - 1) as *const _
166166
} else {
167-
self.end.offset(-1);
168-
}
167+
self.end.offset(-1)
168+
};
169169
Some(ptr::read(self.end))
170170
}
171171
}

‎branches/stable/src/doc/reference.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2390,6 +2390,9 @@ The currently implemented features of the reference compiler are:
23902390

23912391
* - `type_ascription` - Allows type ascription expressions `expr: Type`.
23922392

2393+
* - `abi_vectorcall` - Allows the usage of the vectorcall calling convention
2394+
(e.g. `extern "vectorcall" func fn_();`)
2395+
23932396
If a feature is promoted to a language feature, then all existing programs will
23942397
start to receive compilation warnings about `#![feature]` directives which enabled
23952398
the new feature (because the directive is no longer necessary). However, if a

‎branches/stable/src/jemalloc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit f84e30927284b0c500ed3eaf09e8e159da20ddaf
1+
Subproject commit e24a1a025a1f214e40eedafe3b9c7b1d69937922

‎branches/stable/src/liballoc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
#![feature(custom_attribute)]
7979
#![feature(fundamental)]
8080
#![feature(lang_items)]
81-
#![feature(num_bits_bytes)]
8281
#![feature(optin_builtin_traits)]
8382
#![feature(placement_in_syntax)]
8483
#![feature(placement_new_protocol)]

‎branches/stable/src/liballoc/raw_vec.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use super::oom;
1616
use super::boxed::Box;
1717
use core::ops::Drop;
1818
use core::cmp;
19-
use core;
2019

2120
/// A low-level utility for more ergonomically allocating, reallocating, and deallocating a
2221
/// a buffer of memory on the heap without having to worry about all the corner cases
@@ -584,7 +583,7 @@ impl<T> Drop for RawVec<T> {
584583

585584
#[inline]
586585
fn alloc_guard(alloc_size: usize) {
587-
if core::usize::BITS < 64 {
586+
if mem::size_of::<usize>() < 8 {
588587
assert!(alloc_size <= ::core::isize::MAX as usize,
589588
"capacity overflow");
590589
}

‎branches/stable/src/libbacktrace/ChangeLog

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
2016-01-04 Jakub Jelinek <jakub@redhat.com>
2+
3+
Update copyright years.
4+
5+
2015-12-18 Andris Pavenis <andris.pavenis@iki.fi>
6+
7+
* configure.ac: Specify that DJGPP do not have mmap even when sys/mman.h exists
8+
* configure: Regenerate
9+
10+
2015-12-09 John David Anglin <danglin@gcc.gnu.org>
11+
12+
PR 68115/libfortran
13+
* configure.ac: Set libbacktrace_cv_sys_sync to no on hppa*-*-hpux*.
14+
* configure: Regenerate.
15+
* elf.c (backtrace_initialize): Cast __sync_bool_compare_and_swap call
16+
to void.
17+
18+
2015-09-17 Ian Lance Taylor <iant@google.com>
19+
20+
* posix.c (backtrace_open): Cast second argument of open() to int.
21+
22+
2015-09-11 Ian Lance Taylor <iant@google.com>
23+
24+
* Makefile.am (backtrace.lo): Depend on internal.h.
25+
(sort.lo, stest.lo): Add explicit dependencies.
26+
* Makefile.in: Rebuild.
27+
28+
2015-09-09 Hans-Peter Nilsson <hp@axis.com>
29+
30+
* backtrace.c: #include <sys/types.h>.
31+
32+
2015-09-08 Ian Lance Taylor <iant@google.com>
33+
34+
PR other/67457
35+
* backtrace.c: #include "internal.h".
36+
(struct backtrace_data): Add can_alloc field.
37+
(unwind): If can_alloc is false, don't try to get file/line
38+
information.
39+
(backtrace_full): Set can_alloc field in bdata.
40+
* alloc.c (backtrace_alloc): Don't call error_callback if it is
41+
NULL.
42+
* mmap.c (backtrace_alloc): Likewise.
43+
* internal.h: Update comments for backtrace_alloc and
44+
backtrace_free.
45+
46+
2015-09-08 Ian Lance Taylor <iant@google.com>
47+
48+
PR other/67457
49+
* mmap.c (backtrace_alloc): Correct test for mmap failure.
50+
51+
2015-08-31 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
52+
53+
* configure.ac: For spu-*-* targets, set have_fcntl to no.
54+
* configure: Regenerate.
55+
56+
2015-08-27 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
57+
58+
* configure.ac: Remove [disable-shared] argument to LT_INIT.
59+
Remove setting PIC_FLAG when building as target library.
60+
* configure: Regenerate.
61+
62+
2015-08-26 Hans-Peter Nilsson <hp@axis.com>
63+
64+
* configure.ac: Only compile with -fPIC if the target
65+
supports it.
66+
* configure: Regenerate.
67+
168
2015-08-24 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
269

370
* configure.ac: Set have_mmap to no on spu-*-* targets.
@@ -497,3 +564,9 @@
497564
2012-09-17 Ian Lance Taylor <iant@google.com>
498565

499566
* Initial implementation.
567+
568+
Copyright (C) 2012-2016 Free Software Foundation, Inc.
569+
570+
Copying and distribution of this file, with or without modification,
571+
are permitted in any medium without royalty provided the copyright
572+
notice and this notice are preserved.

‎branches/stable/src/libbacktrace/Makefile.am

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Makefile.am -- Backtrace Makefile.
2-
# Copyright (C) 2012-2015 Free Software Foundation, Inc.
2+
# Copyright (C) 2012-2016 Free Software Foundation, Inc.
33

44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions are
@@ -116,7 +116,7 @@ endif NATIVE
116116

117117
INCDIR = $(top_srcdir)/../include
118118
alloc.lo: config.h backtrace.h internal.h
119-
backtrace.lo: config.h backtrace.h
119+
backtrace.lo: config.h backtrace.h internal.h
120120
btest.lo: (INCDIR)/filenames.h backtrace.h backtrace-supported.h
121121
dwarf.lo: config.h $(INCDIR)/dwarf2.h $(INCDIR)/dwarf2.def \
122122
$(INCDIR)/filenames.h backtrace.h internal.h
@@ -130,5 +130,7 @@ posix.lo: config.h backtrace.h internal.h
130130
print.lo: config.h backtrace.h internal.h
131131
read.lo: config.h backtrace.h internal.h
132132
simple.lo: config.h backtrace.h internal.h
133+
sort.lo: config.h backtrace.h internal.h
134+
stest.lo: config.h backtrace.h internal.h
133135
state.lo: config.h backtrace.h backtrace-supported.h internal.h
134136
unknown.lo: config.h backtrace.h internal.h

‎branches/stable/src/libbacktrace/Makefile.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ AUTOMAKE = @AUTOMAKE@
162162
AWK = @AWK@
163163
BACKTRACE_FILE = @BACKTRACE_FILE@
164164
BACKTRACE_SUPPORTED = @BACKTRACE_SUPPORTED@
165+
BACKTRACE_SUPPORTS_DATA = @BACKTRACE_SUPPORTS_DATA@
165166
BACKTRACE_SUPPORTS_THREADS = @BACKTRACE_SUPPORTS_THREADS@
166167
BACKTRACE_USES_MALLOC = @BACKTRACE_USES_MALLOC@
167168
CC = @CC@
@@ -745,7 +746,7 @@ uninstall-am:
745746
uninstall-am
746747

747748
alloc.lo: config.h backtrace.h internal.h
748-
backtrace.lo: config.h backtrace.h
749+
backtrace.lo: config.h backtrace.h internal.h
749750
btest.lo: (INCDIR)/filenames.h backtrace.h backtrace-supported.h
750751
dwarf.lo: config.h $(INCDIR)/dwarf2.h $(INCDIR)/dwarf2.def \
751752
$(INCDIR)/filenames.h backtrace.h internal.h
@@ -759,6 +760,8 @@ posix.lo: config.h backtrace.h internal.h
759760
print.lo: config.h backtrace.h internal.h
760761
read.lo: config.h backtrace.h internal.h
761762
simple.lo: config.h backtrace.h internal.h
763+
sort.lo: config.h backtrace.h internal.h
764+
stest.lo: config.h backtrace.h internal.h
762765
state.lo: config.h backtrace.h backtrace-supported.h internal.h
763766
unknown.lo: config.h backtrace.h internal.h
764767

‎branches/stable/src/libbacktrace/alloc.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* alloc.c -- Memory allocation without mmap.
2-
Copyright (C) 2012-2015 Free Software Foundation, Inc.
2+
Copyright (C) 2012-2016 Free Software Foundation, Inc.
33
Written by Ian Lance Taylor, Google.
44
55
Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,8 @@ POSSIBILITY OF SUCH DAMAGE. */
4444
backtrace functions may not be safely invoked from a signal
4545
handler. */
4646

47-
/* Allocate memory like malloc. */
47+
/* Allocate memory like malloc. If ERROR_CALLBACK is NULL, don't
48+
report an error. */
4849

4950
void *
5051
backtrace_alloc (struct backtrace_state *state ATTRIBUTE_UNUSED,
@@ -55,7 +56,10 @@ backtrace_alloc (struct backtrace_state *state ATTRIBUTE_UNUSED,
5556

5657
ret = malloc (size);
5758
if (ret == NULL)
58-
error_callback (data, "malloc", errno);
59+
{
60+
if (error_callback)
61+
error_callback (data, "malloc", errno);
62+
}
5963
return ret;
6064
}
6165

0 commit comments

Comments
 (0)