Skip to content

Commit 89aae86

Browse files
committed
---
yaml --- r: 271375 b: refs/heads/auto c: ee4b607 h: refs/heads/master i: 271373: 11bed09 271371: fb67570 271367: 8249744 271359: b48de84
1 parent 3e3b161 commit 89aae86

File tree

129 files changed

+846
-3085
lines changed

Some content is hidden

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

129 files changed

+846
-3085
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 4621dd21715c2abee70f3057c608d1ee9c3e8b84
11+
refs/heads/auto: ee4b607dfbc5f857eb1c500f2f2ff84062feb926
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ build.
7777
7878
Download [MinGW from
7979
here](http://mingw-w64.org/doku.php/download/mingw-builds), and choose the
80-
`version=4.9.x,threads=win32,exceptions=dwarf/seh` flavor when installing. Also, make sure to install to a path without spaces in it. After installing,
80+
`threads=win32,exceptions=dwarf/seh` flavor when installing. Also, make sure to install to a path without spaces in it. After installing,
8181
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

branches/auto/RELEASES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ Compatibility Notes
116116
that were not intended. In this release, [defaulted type parameters
117117
appearing outside of type definitions will generate a
118118
warning][1.7d], which will become an error in future releases.
119-
* [Parsing "." as a float results in an error instead of 0][1.7p].
120-
That is, `".".parse::<f32>()` returns `Err`, not `Ok(0.0)`.
119+
* [Parsing "." as a float results in an error instead of
120+
0][1.7p]. That is, `".".parse::<f32>()` returns `Err`, not `Ok(0)`.
121121
* [Borrows of closure parameters may not outlive the closure][1.7bc].
122122

123123
[1.7a]: https://github.com/rust-lang/rust/pull/30928

branches/auto/mk/cfg/i586-unknown-linux-gnu.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ CFG_LIB_NAME_i586-unknown-linux-gnu=lib$(1).so
77
CFG_STATIC_LIB_NAME_i586-unknown-linux-gnu=lib$(1).a
88
CFG_LIB_GLOB_i586-unknown-linux-gnu=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_i586-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
10-
CFG_JEMALLOC_CFLAGS_i586-unknown-linux-gnu := -m32 $(CFLAGS) -march=pentium
11-
CFG_GCCISH_CFLAGS_i586-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) -march=pentium
12-
CFG_GCCISH_CXXFLAGS_i586-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) -march=pentium
10+
CFG_JEMALLOC_CFLAGS_i586-unknown-linux-gnu := -m32 $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_i586-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_i586-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_i586-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
1414
CFG_GCCISH_DEF_FLAG_i586-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
1515
CFG_LLC_FLAGS_i586-unknown-linux-gnu :=

branches/auto/src/bootstrap/build/native.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@ pub fn llvm(build: &Build, target: &str) {
3939

4040
let _ = fs::remove_dir_all(&dst.join("build"));
4141
t!(fs::create_dir_all(&dst.join("build")));
42-
let mut assertions = if build.config.llvm_assertions {"ON"} else {"OFF"};
43-
44-
// Disable LLVM assertions on ARM compilers until #32360 is fixed
45-
if target.contains("arm") && target.contains("gnu") {
46-
assertions = "OFF";
47-
}
42+
let assertions = if build.config.llvm_assertions {"ON"} else {"OFF"};
4843

4944
// http://llvm.org/docs/CMake.html
5045
let mut cfg = cmake::Config::new(build.src.join("src/llvm"));
@@ -119,8 +114,7 @@ pub fn compiler_rt(build: &Build, target: &str) {
119114
let arch = target.split('-').next().unwrap();
120115
let mode = if build.config.rust_optimize {"Release"} else {"Debug"};
121116
let (dir, build_target, libname) = if target.contains("linux") ||
122-
target.contains("freebsd") ||
123-
target.contains("netbsd") {
117+
target.contains("freebsd") {
124118
let os = if target.contains("android") {"-android"} else {""};
125119
let arch = if arch.starts_with("arm") && target.contains("eabihf") {
126120
"armhf"

branches/auto/src/compiletest/runtest.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,10 +1025,6 @@ fn check_expected_errors(revision: Option<&str>,
10251025
expected.replace(r"\", "/")
10261026
}).collect::<Vec<String>>();
10271027

1028-
// If the testcase being checked contains at least one expected "help"
1029-
// message, then we'll ensure that all "help" messages are expected.
1030-
// Otherwise, all "help" messages reported by the compiler will be ignored.
1031-
// This logic also applies to "note" messages.
10321028
let (expect_help, expect_note) =
10331029
expected_errors.iter()
10341030
.fold((false, false),

branches/auto/src/doc/book/error-handling.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,16 +2019,6 @@ impl Error for CliError {
20192019
CliError::NotFound => "not found",
20202020
}
20212021
}
2022-
2023-
fn cause(&self) -> Option<&error::Error> {
2024-
match *self {
2025-
CliError::Io(ref err) => Some(err),
2026-
CliError::Parse(ref err) => Some(err),
2027-
// Our custom error doesn't have an underlying cause, but we could
2028-
// modify it so that it does.
2029-
CliError::NotFound() => None,
2030-
}
2031-
}
20322022
}
20332023
```
20342024

branches/auto/src/doc/book/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ unofficial locations.
9393
| `armv7-apple-ios` || | | ARM iOS |
9494
| `armv7s-apple-ios` || | | ARM iOS |
9595
| `aarch64-apple-ios` || | | ARM64 iOS |
96-
| `i686-unknown-freebsd` ||| | 32-bit FreeBSD |
97-
| `x86_64-unknown-freebsd` ||| | 64-bit FreeBSD |
96+
| `i686-unknown-freebsd` ||| | 32-bit FreeBSD |
97+
| `x86_64-unknown-freebsd` ||| | 64-bit FreeBSD |
9898
| `x86_64-unknown-openbsd` ||| | 64-bit OpenBSD |
9999
| `x86_64-unknown-netbsd` ||| | 64-bit NetBSD |
100100
| `x86_64-unknown-bitrig` ||| | 64-bit Bitrig |

branches/auto/src/doc/book/guessing-game.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ returned by `parse()`, this is an `enum` like `Ordering`, but in this case,
912912
each variant has some data associated with it: `Ok` is a success, and `Err` is a
913913
failure. Each contains more information: the successfully parsed integer, or an
914914
error type. In this case, we `match` on `Ok(num)`, which sets the name `num` to
915-
the unwrapped `Ok` value (the integer), and then we return it on the
915+
the unwrapped `Ok` value (ythe integer), and then we return it on the
916916
right-hand side. In the `Err` case, we don’t care what kind of error it is, so
917917
we just use the catch all `_` instead of a name. This catches everything that
918918
isn't `Ok`, and `continue` lets us move to the next iteration of the loop; in

branches/auto/src/doc/book/match.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ give us an error:
3636
error: non-exhaustive patterns: `_` not covered
3737
```
3838

39-
Rust is telling us that we forgot some value. The compiler infers from `x` that it
40-
can have any 32bit integer value; for example -2,147,483,648 to 2,147,483,647. The `_` acts
39+
Rust is telling us that we forgot a value. The compiler infers from `x` that it
40+
can have any positive 32bit value; for example 1 to 2,147,483,647. The `_` acts
4141
as a 'catch-all', and will catch all possible values that *aren't* specified in
42-
an arm of `match`. As you can see in the previous example, we provide `match`
42+
an arm of `match`. As you can see with the previous example, we provide `match`
4343
arms for integers 1-5, if `x` is 6 or any other value, then it is caught by `_`.
4444

4545
`match` is also an expression, which means we can use it on the right-hand

branches/auto/src/doc/book/primitive-types.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ of these ones, as well, but these are the most primitive.
77

88
# Booleans
99

10-
Rust has a built-in boolean type, named `bool`. It has two values, `true` and `false`:
10+
Rust has a built in boolean type, named `bool`. It has two values, `true` and `false`:
1111

1212
```rust
1313
let x = true;
@@ -89,13 +89,13 @@ Unsigned types use a `u` for their category, and signed types use `i`. The `i`
8989
is for ‘integer’. So `u8` is an eight-bit unsigned number, and `i8` is an
9090
eight-bit signed number.
9191

92-
## Fixed-size types
92+
## Fixed size types
9393

94-
Fixed-size types have a specific number of bits in their representation. Valid
94+
Fixed size types have a specific number of bits in their representation. Valid
9595
bit sizes are `8`, `16`, `32`, and `64`. So, `u32` is an unsigned, 32-bit integer,
9696
and `i64` is a signed, 64-bit integer.
9797

98-
## Variable-size types
98+
## Variable sized types
9999

100100
Rust also provides types whose size depends on the size of a pointer of the
101101
underlying machine. These types have ‘size’ as the category, and come in signed

branches/auto/src/doc/book/references-and-borrowing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ both at the same time:
163163
* exactly one mutable reference (`&mut T`).
164164

165165

166-
You may notice that this is very similar to, though not exactly the same as,
167-
the definition of a data race:
166+
You may notice that this is very similar, though not exactly the same as,
167+
to the definition of a data race:
168168

169169
> There is a ‘data race’ when two or more pointers access the same memory
170170
> location at the same time, where at least one of them is writing, and the
@@ -212,7 +212,7 @@ fn main() {
212212

213213
In other words, the mutable borrow is held through the rest of our example. What
214214
we want is for the mutable borrow by `y` to end so that the resource can be
215-
returned to the owner, `x`. `x` can then provide a immutable borrow to `println!`.
215+
returned to the owner, `x`. `x` can then provide a mutable borrow to `println!`.
216216
In Rust, borrowing is tied to the scope that the borrow is valid for. And our
217217
scopes look like this:
218218

branches/auto/src/doc/book/variable-bindings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ function, rather than leaving it off. Otherwise, you’ll get an error.
1818

1919
In many languages, a variable binding would be called a *variable*, but Rust’s
2020
variable bindings have a few tricks up their sleeves. For example the
21-
left-hand side of a `let` statement is a ‘[pattern][pattern]’, not a
21+
left-hand side of a `let` expression is a ‘[pattern][pattern]’, not a
2222
variable name. This means we can do things like:
2323

2424
```rust
2525
let (x, y) = (1, 2);
2626
```
2727

28-
After this statement is evaluated, `x` will be one, and `y` will be two.
28+
After this expression is evaluated, `x` will be one, and `y` will be two.
2929
Patterns are really powerful, and have [their own section][pattern] in the
3030
book. We don’t need those features for now, so we’ll keep this in the back
3131
of our minds as we go forward.

branches/auto/src/libcore/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
authors = ["The Rust Project Developers"]
33
name = "core"
44
version = "0.0.0"
5-
build = "build.rs"
65

76
[lib]
87
name = "core"

branches/auto/src/libcore/build.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

branches/auto/src/libcore/char.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,14 @@ pub fn encode_utf16_raw(mut ch: u32, dst: &mut [u16]) -> Option<usize> {
416416
///
417417
/// [`escape_unicode()`]: ../../std/primitive.char.html#method.escape_unicode
418418
/// [`char`]: ../../std/primitive.char.html
419-
#[derive(Clone, Debug)]
419+
#[derive(Clone)]
420420
#[stable(feature = "rust1", since = "1.0.0")]
421421
pub struct EscapeUnicode {
422422
c: char,
423423
state: EscapeUnicodeState
424424
}
425425

426-
#[derive(Clone, Debug)]
426+
#[derive(Clone)]
427427
enum EscapeUnicodeState {
428428
Backslash,
429429
Type,
@@ -496,13 +496,13 @@ impl Iterator for EscapeUnicode {
496496
///
497497
/// [`escape_default()`]: ../../std/primitive.char.html#method.escape_default
498498
/// [`char`]: ../../std/primitive.char.html
499-
#[derive(Clone, Debug)]
499+
#[derive(Clone)]
500500
#[stable(feature = "rust1", since = "1.0.0")]
501501
pub struct EscapeDefault {
502502
state: EscapeDefaultState
503503
}
504504

505-
#[derive(Clone, Debug)]
505+
#[derive(Clone)]
506506
enum EscapeDefaultState {
507507
Backslash(char),
508508
Char(char),

branches/auto/src/libcore/cmp.rs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,6 @@
1414
//! by the compiler to implement comparison operators. Rust programs may
1515
//! implement `PartialOrd` to overload the `<`, `<=`, `>`, and `>=` operators,
1616
//! and may implement `PartialEq` to overload the `==` and `!=` operators.
17-
//!
18-
//! # Examples
19-
//!
20-
//! ```
21-
//! let x: u32 = 0;
22-
//! let y: u32 = 1;
23-
//!
24-
//! // these two lines are equivalent
25-
//! assert_eq!(x < y, true);
26-
//! assert_eq!(x.lt(&y), true);
27-
//!
28-
//! // these two lines are also equivalent
29-
//! assert_eq!(x == y, false);
30-
//! assert_eq!(x.eq(&y), false);
31-
//! ```
3217
3318
#![stable(feature = "rust1", since = "1.0.0")]
3419

@@ -59,16 +44,6 @@ use option::Option::{self, Some};
5944
/// only if `a != b`.
6045
///
6146
/// This trait can be used with `#[derive]`.
62-
///
63-
/// # Examples
64-
///
65-
/// ```
66-
/// let x: u32 = 0;
67-
/// let y: u32 = 1;
68-
///
69-
/// assert_eq!(x == y, false);
70-
/// assert_eq!(x.eq(&y), false);
71-
/// ```
7247
#[lang = "eq"]
7348
#[stable(feature = "rust1", since = "1.0.0")]
7449
pub trait PartialEq<Rhs: ?Sized = Self> {
@@ -251,16 +226,6 @@ impl PartialOrd for Ordering {
251226
///
252227
/// This trait can be used with `#[derive]`. When `derive`d, it will produce an ordering
253228
/// based on the top-to-bottom declaration order of the struct's members.
254-
///
255-
/// # Examples
256-
///
257-
/// ```
258-
/// let x : u32 = 0;
259-
/// let y : u32 = 1;
260-
///
261-
/// assert_eq!(x < y, true);
262-
/// assert_eq!(x.lt(&y), true);
263-
/// ```
264229
#[lang = "ord"]
265230
#[stable(feature = "rust1", since = "1.0.0")]
266231
pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {

branches/auto/src/libcore/fmt/builders.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ impl<'a, 'b: 'a> fmt::Write for PadAdapter<'a, 'b> {
5454
///
5555
/// Constructed by the `Formatter::debug_struct` method.
5656
#[must_use]
57-
#[allow(missing_debug_implementations)]
5857
#[stable(feature = "debug_builders", since = "1.2.0")]
5958
pub struct DebugStruct<'a, 'b: 'a> {
6059
fmt: &'a mut fmt::Formatter<'b>,
@@ -121,7 +120,6 @@ impl<'a, 'b: 'a> DebugStruct<'a, 'b> {
121120
///
122121
/// Constructed by the `Formatter::debug_tuple` method.
123122
#[must_use]
124-
#[allow(missing_debug_implementations)]
125123
#[stable(feature = "debug_builders", since = "1.2.0")]
126124
pub struct DebugTuple<'a, 'b: 'a> {
127125
fmt: &'a mut fmt::Formatter<'b>,
@@ -233,7 +231,6 @@ impl<'a, 'b: 'a> DebugInner<'a, 'b> {
233231
///
234232
/// Constructed by the `Formatter::debug_set` method.
235233
#[must_use]
236-
#[allow(missing_debug_implementations)]
237234
#[stable(feature = "debug_builders", since = "1.2.0")]
238235
pub struct DebugSet<'a, 'b: 'a> {
239236
inner: DebugInner<'a, 'b>,
@@ -282,7 +279,6 @@ impl<'a, 'b: 'a> DebugSet<'a, 'b> {
282279
///
283280
/// Constructed by the `Formatter::debug_list` method.
284281
#[must_use]
285-
#[allow(missing_debug_implementations)]
286282
#[stable(feature = "debug_builders", since = "1.2.0")]
287283
pub struct DebugList<'a, 'b: 'a> {
288284
inner: DebugInner<'a, 'b>,
@@ -331,7 +327,6 @@ impl<'a, 'b: 'a> DebugList<'a, 'b> {
331327
///
332328
/// Constructed by the `Formatter::debug_map` method.
333329
#[must_use]
334-
#[allow(missing_debug_implementations)]
335330
#[stable(feature = "debug_builders", since = "1.2.0")]
336331
pub struct DebugMap<'a, 'b: 'a> {
337332
fmt: &'a mut fmt::Formatter<'b>,

0 commit comments

Comments
 (0)