Skip to content

Commit 743999b

Browse files
committed
---
yaml --- r: 232251 b: refs/heads/auto c: cefe5f2 h: refs/heads/master i: 232249: f29e2fd 232247: bef825e v: v3
1 parent d139264 commit 743999b

File tree

99 files changed

+1470
-626
lines changed

Some content is hidden

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

99 files changed

+1470
-626
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: b0bcde4b47c1cdf09b58988f87f9a6c3cd8d461e
11+
refs/heads/auto: cefe5f25b27b27c9d2f8685a7e16c852f9f77f60
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/mk/cfg/x86_64-unknown-netbsd.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# x86_64-unknown-netbsd configuration
2+
CROSS_PREFIX_x86_64-unknown-netbsd=x86_64-unknown-netbsd-
23
CC_x86_64-unknown-netbsd=$(CC)
34
CXX_x86_64-unknown-netbsd=$(CXX)
45
CPP_x86_64-unknown-netbsd=$(CPP)

branches/auto/src/compiletest/runtest.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,8 +1669,7 @@ fn compile_test_and_save_ir(config: &Config, props: &TestProps,
16691669
// FIXME (#9639): This needs to handle non-utf8 paths
16701670
let mut link_args = vec!("-L".to_owned(),
16711671
aux_dir.to_str().unwrap().to_owned());
1672-
let llvm_args = vec!("--emit=llvm-ir".to_owned(),
1673-
"--crate-type=lib".to_owned());
1672+
let llvm_args = vec!("--emit=llvm-ir".to_owned(),);
16741673
link_args.extend(llvm_args);
16751674
let args = make_compile_args(config,
16761675
props,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2064,7 +2064,7 @@ string and add a flag to the Option variable. Once were done that, Getopts does
20642064
let mut opts = Options::new();
20652065
opts.optopt("f", "file", "Choose an input file, instead of using STDIN.", "NAME");
20662066
opts.optflag("h", "help", "Show this usage message.");
2067-
opts.optflag("q", "quit", "Silences errors and warnings.");
2067+
opts.optflag("q", "quiet", "Silences errors and warnings.");
20682068
...
20692069
```
20702070

branches/auto/src/liballoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
#![cfg_attr(stage0, feature(alloc_system))]
101101
#![cfg_attr(not(stage0), feature(needs_allocator))]
102102

103-
#![cfg_attr(test, feature(test, rustc_private))]
103+
#![cfg_attr(test, feature(test, rustc_private, box_heap))]
104104

105105
#[cfg(stage0)]
106106
extern crate alloc_system;

branches/auto/src/libcollections/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
#![feature(core_intrinsics)]
3939
#![feature(core_slice_ext)]
4040
#![feature(core_str_ext)]
41+
#![feature(fmt_internals)]
42+
#![feature(fmt_radix)]
4143
#![feature(heap_api)]
4244
#![feature(iter_order)]
4345
#![feature(iter_arith)]
@@ -47,6 +49,8 @@
4749
#![feature(oom)]
4850
#![feature(pattern)]
4951
#![feature(ptr_as_ref)]
52+
#![feature(ref_slice)]
53+
#![feature(slice_bytes)]
5054
#![feature(slice_patterns)]
5155
#![feature(staged_api)]
5256
#![feature(step_by)]

branches/auto/src/libcollections/str.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ use slice::SliceConcatExt;
3838
use boxed::Box;
3939

4040
pub use core::str::{FromStr, Utf8Error};
41+
#[allow(deprecated)]
4142
pub use core::str::{Lines, LinesAny, CharRange};
4243
pub use core::str::{Split, RSplit};
4344
pub use core::str::{SplitN, RSplitN};

0 commit comments

Comments
 (0)