Skip to content

Commit 2240ef8

Browse files
committed
---
yaml --- r: 190311 b: refs/heads/auto c: fe9bb26 h: refs/heads/master i: 190309: 4ad2314 190307: e29c468 190303: b89cfc3 v: v3
1 parent 6b5f161 commit 2240ef8

File tree

20 files changed

+147
-98
lines changed

20 files changed

+147
-98
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 9d8bafe7427be171a54c346afdbb7d2bcebb4316
13+
refs/heads/auto: fe9bb26e783fd6f09348019938b83f77f8185206
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,11 +823,11 @@ then
823823
LLVM_VERSION=$($LLVM_CONFIG --version)
824824

825825
case $LLVM_VERSION in
826-
(3.[5-6]*)
826+
(3.[2-6]*)
827827
msg "found ok version of LLVM: $LLVM_VERSION"
828828
;;
829829
(*)
830-
err "bad LLVM version: $LLVM_VERSION, need >=3.5"
830+
err "bad LLVM version: $LLVM_VERSION, need >=3.0svn"
831831
;;
832832
esac
833833
fi

branches/auto/mk/main.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ LLVM_VERSION_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --version)
290290
LLVM_BINDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --bindir)
291291
LLVM_INCDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --includedir)
292292
LLVM_LIBDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --libdir)
293-
LLVM_LIBDIR_RUSTFLAGS_$(1)=-L "$$(LLVM_LIBDIR_$(1))"
294293
LLVM_LIBS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --libs $$(LLVM_COMPONENTS))
295294
LLVM_LDFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --ldflags)
296295
# On FreeBSD, it may search wrong headers (that are for pre-installed LLVM),

branches/auto/mk/target.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
8484
$$(subst @,,$$(STAGE$(1)_T_$(2)_H_$(3))) \
8585
$$(RUST_LIB_FLAGS_ST$(1)) \
8686
-L "$$(RT_OUTPUT_DIR_$(2))" \
87-
$$(LLVM_LIBDIR_RUSTFLAGS_$(2)) \
87+
-L "$$(LLVM_LIBDIR_$(2))" \
8888
$$(LLVM_STDCPP_RUSTFLAGS_$(2)) \
8989
$$(RUSTFLAGS_$(4)) \
9090
--out-dir $$(@D) \

branches/auto/mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
372372
$(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(3)) \
373373
$$(subst @,,$$(STAGE$(1)_T_$(2)_H_$(3))) -o $$@ $$< --test \
374374
-L "$$(RT_OUTPUT_DIR_$(2))" \
375-
$$(LLVM_LIBDIR_RUSTFLAGS_$(2)) \
375+
-L "$$(LLVM_LIBDIR_$(2))" \
376376
$$(RUSTFLAGS_$(4))
377377

378378
endef

branches/auto/src/doc/trpl/closures.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ is that a moving closure always takes ownership of all variables that
6868
it uses. Ordinary closures, in contrast, just create a reference into
6969
the enclosing stack frame. Moving closures are most useful with Rust's
7070
concurrency features, and so we'll just leave it at this for
71-
now. We'll talk about them more in the "Concurrency" chapter of the book.
71+
now. We'll talk about them more in the "Threads" section of the guide.
7272

7373
## Accepting closures as arguments
7474

branches/auto/src/doc/trpl/concurrency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ fn main() {
339339
});
340340
}
341341
342-
rx.recv().ok().expect("Could not receive answer");
342+
rx.recv().ok().expect("Could not recieve answer");
343343
}
344344
```
345345

branches/auto/src/doc/trpl/method-syntax.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@ impl CircleBuilder {
187187
}
188188
189189
fn coordinate(&mut self, coordinate: f64) -> &mut CircleBuilder {
190-
self.coordinate = coordinate;
191-
self
190+
self.coordinate = coordinate;
191+
self
192192
}
193193
194194
fn radius(&mut self, radius: f64) -> &mut CircleBuilder {
195-
self.radius = radius;
196-
self
195+
self.radius = radius;
196+
self
197197
}
198198
199199
fn finalize(&self) -> Circle {

branches/auto/src/librustc/session/search_paths.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
use std::slice;
1212
use std::path::{Path, PathBuf};
13-
use session::early_error;
1413

1514
#[derive(Clone, Debug)]
1615
pub struct SearchPaths {
@@ -51,9 +50,6 @@ impl SearchPaths {
5150
} else {
5251
(PathKind::All, path)
5352
};
54-
if path.is_empty() {
55-
early_error("empty search path given via `-L`");
56-
}
5753
self.paths.push((kind, PathBuf::new(path)));
5854
}
5955

branches/auto/src/librustc_lint/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ impl NonCamelCaseTypes {
811811
if i == 0 {
812812
c.to_uppercase().collect::<String>()
813813
} else {
814-
c.to_lowercase().collect()
814+
c.to_string()
815815
}
816816
)).collect::<Vec<_>>().concat()
817817
}

branches/auto/src/librustc_trans/trans/tvec.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ pub fn write_content<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
293293
}
294294
SaveIn(lldest) => {
295295
match ty::eval_repeat_count(bcx.tcx(), &**count_expr) {
296-
0 => expr::trans_into(bcx, &**element, Ignore),
296+
0 => bcx,
297297
1 => expr::trans_into(bcx, &**element, SaveIn(lldest)),
298298
count => {
299299
let elem = unpack_datum!(bcx, expr::trans(bcx, &**element));
@@ -410,12 +410,8 @@ pub fn iter_vec_loop<'blk, 'tcx, F>(bcx: Block<'blk, 'tcx>,
410410
F: FnOnce(Block<'blk, 'tcx>, ValueRef, Ty<'tcx>) -> Block<'blk, 'tcx>,
411411
{
412412
let _icx = push_ctxt("tvec::iter_vec_loop");
413-
414-
if bcx.unreachable.get() {
415-
return bcx;
416-
}
417-
418413
let fcx = bcx.fcx;
414+
419415
let loop_bcx = fcx.new_temp_block("expr_repeat");
420416
let next_bcx = fcx.new_temp_block("expr_repeat: next");
421417

branches/auto/src/libstd/env.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ pub fn get_exit_status() -> i32 {
452452
EXIT_STATUS.load(Ordering::SeqCst) as i32
453453
}
454454

455-
/// An iterator over the arguments of a process, yielding an `String` value
455+
/// An iterator over the arguments of a process, yielding a `String` value
456456
/// for each argument.
457457
///
458458
/// This structure is created through the `std::env::args` method.

branches/auto/src/libstd/io/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
// except according to those terms.
1010

1111
//! Traits, helpers, and type definitions for core I/O functionality.
12+
//!
13+
//! > **NOTE**: This module is very much a work in progress and is under active
14+
//! > development. At this time it is still recommended to use the `old_io`
15+
//! > module while the details of this module shake out.
1216
1317
#![stable(feature = "rust1", since = "1.0.0")]
1418

branches/auto/src/libstd/io/stdio.rs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ use sys::stdio;
2121
/// A handle to a raw instance of the standard input stream of this process.
2222
///
2323
/// This handle is not synchronized or buffered in any fashion. Constructed via
24-
/// the `std::io::stdio::stdin_raw` function.
25-
struct StdinRaw(stdio::Stdin);
24+
/// the `std::io::stdin_raw` function.
25+
pub struct StdinRaw(stdio::Stdin);
2626

2727
/// A handle to a raw instance of the standard output stream of this process.
2828
///
2929
/// This handle is not synchronized or buffered in any fashion. Constructed via
30-
/// the `std::io::stdio::stdout_raw` function.
31-
struct StdoutRaw(stdio::Stdout);
30+
/// the `std::io::stdout_raw` function.
31+
pub struct StdoutRaw(stdio::Stdout);
3232

3333
/// A handle to a raw instance of the standard output stream of this process.
3434
///
3535
/// This handle is not synchronized or buffered in any fashion. Constructed via
36-
/// the `std::io::stdio::stderr_raw` function.
37-
struct StderrRaw(stdio::Stderr);
36+
/// the `std::io::stderr_raw` function.
37+
pub struct StderrRaw(stdio::Stderr);
3838

3939
/// Construct a new raw handle to the standard input of this process.
4040
///
@@ -43,7 +43,7 @@ struct StderrRaw(stdio::Stderr);
4343
/// handles is **not** available to raw handles returned from this function.
4444
///
4545
/// The returned handle has no external synchronization or buffering.
46-
fn stdin_raw() -> StdinRaw { StdinRaw(stdio::Stdin::new()) }
46+
pub fn stdin_raw() -> StdinRaw { StdinRaw(stdio::Stdin::new()) }
4747

4848
/// Construct a new raw handle to the standard input stream of this process.
4949
///
@@ -54,7 +54,7 @@ fn stdin_raw() -> StdinRaw { StdinRaw(stdio::Stdin::new()) }
5454
///
5555
/// The returned handle has no external synchronization or buffering layered on
5656
/// top.
57-
fn stdout_raw() -> StdoutRaw { StdoutRaw(stdio::Stdout::new()) }
57+
pub fn stdout_raw() -> StdoutRaw { StdoutRaw(stdio::Stdout::new()) }
5858

5959
/// Construct a new raw handle to the standard input stream of this process.
6060
///
@@ -63,7 +63,7 @@ fn stdout_raw() -> StdoutRaw { StdoutRaw(stdio::Stdout::new()) }
6363
///
6464
/// The returned handle has no external synchronization or buffering layered on
6565
/// top.
66-
fn stderr_raw() -> StderrRaw { StderrRaw(stdio::Stderr::new()) }
66+
pub fn stderr_raw() -> StderrRaw { StderrRaw(stdio::Stderr::new()) }
6767

6868
impl Read for StdinRaw {
6969
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { self.0.read(buf) }
@@ -109,6 +109,9 @@ pub struct StdinLock<'a> {
109109
/// The `Read` trait is implemented for the returned value but the `BufRead`
110110
/// trait is not due to the global nature of the standard input stream. The
111111
/// locked version, `StdinLock`, implements both `Read` and `BufRead`, however.
112+
///
113+
/// To avoid locking and buffering altogether, it is recommended to use the
114+
/// `stdin_raw` constructor.
112115
#[stable(feature = "rust1", since = "1.0.0")]
113116
pub fn stdin() -> Stdin {
114117
static INSTANCE: Lazy<Mutex<BufReader<StdinRaw>>> = lazy_init!(stdin_init);
@@ -221,6 +224,9 @@ pub struct StdoutLock<'a> {
221224
/// provided via the `lock` method.
222225
///
223226
/// The returned handle implements the `Write` trait.
227+
///
228+
/// To avoid locking and buffering altogether, it is recommended to use the
229+
/// `stdout_raw` constructor.
224230
#[stable(feature = "rust1", since = "1.0.0")]
225231
pub fn stdout() -> Stdout {
226232
static INSTANCE: Lazy<Mutex<LineWriter<StdoutRaw>>> = lazy_init!(stdout_init);
@@ -291,6 +297,9 @@ pub struct StderrLock<'a> {
291297
/// this function. No handles are buffered, however.
292298
///
293299
/// The returned handle implements the `Write` trait.
300+
///
301+
/// To avoid locking altogether, it is recommended to use the `stderr_raw`
302+
/// constructor.
294303
#[stable(feature = "rust1", since = "1.0.0")]
295304
pub fn stderr() -> Stderr {
296305
static INSTANCE: Lazy<Mutex<StderrRaw>> = lazy_init!(stderr_init);

branches/auto/src/libstd/path.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
//!
8787
//! * Occurrences of `.` are normalized away, *except* if they are at
8888
//! the beginning of the path (in which case they are often meaningful
89-
//! in terms of path searching). So, for example, `a/./b`, `a/b/`,
90-
//! `/a/b/.` and `a/b` all have components `a` and `b`, but `./a/b`
89+
//! in terms of path searching). So, fore xample, `a/./b`, `a/b/`,
90+
//! `/a/b/.` and `a/b` all ahve components `a` and `b`, but `./a/b`
9191
//! has a leading current directory component.
9292
//!
9393
//! No other normalization takes place by default. In particular,

0 commit comments

Comments
 (0)