Skip to content

Commit df4dee6

Browse files
petrochenkovpetrochenkov
committed
---
yaml --- r: 174666 b: refs/heads/snap-stage3 c: 812ce6c h: refs/heads/master v: v3
1 parent d4acb34 commit df4dee6

File tree

294 files changed

+3917
-5300
lines changed

Some content is hidden

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

294 files changed

+3917
-5300
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 0efdda314a48b5824673510fbaa0c6d9ddf301df
4+
refs/heads/snap-stage3: 812ce6c190d896cf1cc1bef9f22c00266e962c43
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015 The Rust Project Developers
1+
Copyright (c) 2014 The Rust Project Developers
22

33
Permission is hereby granted, free of charge, to any
44
person obtaining a copy of this software and associated

‎branches/snap-stage3/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ putvar CFG_RELEASE_CHANNEL
612612
# channel.
613613
# Basing CFG_BOOTSTRAP_KEY on CFG_BOOTSTRAP_KEY lets it get picked up
614614
# during a Makefile reconfig.
615-
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%H:%M:%S`}"
615+
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%N`}"
616616
putvar CFG_BOOTSTRAP_KEY
617617

618618
step_msg "looking for build programs"

‎branches/snap-stage3/man/rustdoc.1

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,9 @@ space-separated list of plugins to run (default: '')
3535
--plugin-path <val>
3636
directory to load plugins from (default: /tmp/rustdoc_ng/plugins)
3737
.TP
38-
--target <val>
39-
target triple to document
40-
.TP
41-
--crate-name <val>
42-
specify the name of this crate
43-
.TP
4438
-L --library-path <val>
4539
directory to add to crate search path
4640
.TP
47-
--cfg <val>
48-
pass a --cfg to rustc
49-
.TP
50-
--extern <val>
51-
pass an --extern to rustc
52-
.TP
53-
--test
54-
run code examples as tests
55-
.TP
56-
--test-args <val>
57-
pass arguments to the test runner
58-
.TP
5941
--html-in-header <val>
6042
file to add to <head>
6143
.TP
@@ -65,20 +47,8 @@ file to add in <body>, before content
6547
--html-after-content <val>
6648
file to add in <body>, after content
6749
.TP
68-
--markdown-css <val>
69-
CSS files to include via <link> in a rendered Markdown file
70-
.TP
71-
--markdown-playground-url <val>
72-
URL to send code snippets to
73-
.TP
74-
--markdown-no-toc
75-
don't include table of contents
76-
.TP
7750
-h, --help
7851
Print help
79-
.TP
80-
-V, --version
81-
Print rustdoc's version
8252

8353
.SH "OUTPUT FORMATS"
8454

‎branches/snap-stage3/mk/crates.mk

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
TARGET_CRATES := libc std flate arena term \
5353
serialize getopts collections test rand \
5454
log regex graphviz core rbml alloc \
55-
unicode rustc_bitflags
55+
unicode
5656
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
57-
rustc_trans rustc_back rustc_llvm rustc_privacy
57+
rustc_trans rustc_back rustc_llvm
5858
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
5959
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
6060
TOOLS := compiletest rustdoc rustc rustbook
@@ -64,27 +64,22 @@ DEPS_libc := core
6464
DEPS_unicode := core
6565
DEPS_alloc := core libc native:jemalloc
6666
DEPS_std := core libc rand alloc collections unicode \
67-
native:rust_builtin native:backtrace native:rustrt_native \
68-
rustc_bitflags
67+
native:rust_builtin native:backtrace native:rustrt_native
6968
DEPS_graphviz := std
7069
DEPS_syntax := std term serialize log fmt_macros arena libc
7170
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
72-
rustc_typeck rustc_resolve log syntax serialize rustc_llvm \
73-
rustc_trans rustc_privacy
74-
71+
rustc_typeck rustc_resolve log syntax serialize rustc_llvm rustc_trans
7572
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
7673
log syntax serialize rustc_llvm
7774
DEPS_rustc_typeck := rustc syntax
7875
DEPS_rustc_borrowck := rustc log graphviz syntax
7976
DEPS_rustc_resolve := rustc log syntax
80-
DEPS_rustc_privacy := rustc log syntax
8177
DEPS_rustc := syntax flate arena serialize getopts rbml \
8278
log graphviz rustc_llvm rustc_back
8379
DEPS_rustc_llvm := native:rustllvm libc std
8480
DEPS_rustc_back := std syntax rustc_llvm flate log libc
8581
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
8682
test
87-
DEPS_rustc_bitflags := core
8883
DEPS_flate := std native:miniz
8984
DEPS_arena := std
9085
DEPS_graphviz := std
@@ -116,7 +111,6 @@ ONLY_RLIB_alloc := 1
116111
ONLY_RLIB_rand := 1
117112
ONLY_RLIB_collections := 1
118113
ONLY_RLIB_unicode := 1
119-
ONLY_RLIB_rustc_bitflags := 1
120114

121115
################################################################################
122116
# You should not need to edit below this line
@@ -128,13 +122,12 @@ DOC_CRATES := $(filter-out rustc, \
128122
$(filter-out rustc_borrowck, \
129123
$(filter-out rustc_resolve, \
130124
$(filter-out rustc_driver, \
131-
$(filter-out rustc_privacy, \
132125
$(filter-out log, \
133126
$(filter-out regex, \
134127
$(filter-out getopts, \
135-
$(filter-out syntax, $(CRATES))))))))))))
128+
$(filter-out syntax, $(CRATES)))))))))))
136129
COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \
137-
rustc_typeck rustc_driver syntax rustc_privacy
130+
rustc_typeck rustc_driver syntax
138131

139132
# This macro creates some simple definitions for each crate being built, just
140133
# some munging of all of the parameters above.

‎branches/snap-stage3/mk/main.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ ifdef CFG_DISABLE_UNSTABLE_FEATURES
330330
CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
331331
# Turn on feature-staging
332332
export CFG_DISABLE_UNSTABLE_FEATURES
333-
# Subvert unstable feature lints to do the self-build
334-
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
335333
endif
334+
# Subvert unstable feature lints to do the self-build
336335
export CFG_BOOTSTRAP_KEY
336+
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
337337

338338
######################################################################
339339
# Per-stage targets and runner

‎branches/snap-stage3/mk/tests.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,8 +1011,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10111011
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
10121012
"$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
10131013
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1014-
$(1) \
1015-
$$(S)
1014+
$(1)
10161015
@touch $$@
10171016
else
10181017
# FIXME #11094 - The above rule doesn't work right for multiple targets

‎branches/snap-stage3/src/compiletest/compiletest.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#![feature(slicing_syntax, unboxed_closures)]
1414
#![feature(box_syntax)]
1515
#![feature(int_uint)]
16-
#![allow(unstable)]
1716

1817
#![deny(warnings)]
1918

‎branches/snap-stage3/src/doc/guide-crates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Crates and Modules Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/crates-and-modules.html).

‎branches/snap-stage3/src/doc/guide-error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% Error Handling in Rust
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/error-handling.html).

‎branches/snap-stage3/src/doc/guide-ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Foreign Function Interface Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/ffi.html).

‎branches/snap-stage3/src/doc/guide-macros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Macros Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/macros.html).

‎branches/snap-stage3/src/doc/guide-ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Ownership Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/ownership.html).

‎branches/snap-stage3/src/doc/guide-plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Compiler Plugins Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/plugins.html).

‎branches/snap-stage3/src/doc/guide-pointers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Pointer Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/pointers.html).

‎branches/snap-stage3/src/doc/guide-strings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Guide to Rust Strings
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/strings.html).

‎branches/snap-stage3/src/doc/guide-tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Threads and Communication Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/tasks.html).

‎branches/snap-stage3/src/doc/guide-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Testing Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/testing.html).

‎branches/snap-stage3/src/doc/guide-unsafe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% Writing Safe Low-level and Unsafe Code in Rust
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/unsafe.html).

‎branches/snap-stage3/src/doc/guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Guide
22

3-
This content has moved into
3+
This content has moved into the
44
[the Rust Programming Language book](book/README.html).

‎branches/snap-stage3/src/doc/intro.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -424,11 +424,11 @@ Let's see an example. This Rust code will not compile:
424424
use std::thread::Thread;
425425
426426
fn main() {
427-
let mut numbers = vec![1is, 2, 3];
427+
let mut numbers = vec![1i, 2i, 3i];
428428
429-
for i in 0..3 {
429+
for i in range(0u, 3u) {
430430
Thread::spawn(move || {
431-
for j in 0..3 { numbers[j] += 1 }
431+
for j in range(0, 3) { numbers[j] += 1 }
432432
});
433433
}
434434
}
@@ -438,15 +438,15 @@ It gives us this error:
438438
439439
```text
440440
6:71 error: capture of moved value: `numbers`
441-
for j in 0..3 { numbers[j] += 1 }
442-
^~~~~~~
441+
for j in range(0, 3) { numbers[j] += 1 }
442+
^~~~~~~
443443
7:50 note: `numbers` moved into closure environment here
444444
spawn(move || {
445-
for j in 0..3 { numbers[j] += 1 }
445+
for j in range(0, 3) { numbers[j] += 1 }
446446
});
447447
6:79 error: cannot assign to immutable dereference (dereference is implicit, due to indexing)
448-
for j in 0..3 { numbers[j] += 1 }
449-
^~~~~~~~~~~~~~~
448+
for j in range(0, 3) { numbers[j] += 1 }
449+
^~~~~~~~~~~~~~~
450450
```
451451
452452
It mentions that "numbers moved into closure environment". Because we
@@ -478,9 +478,9 @@ use std::thread::Thread;
478478
use std::sync::{Arc,Mutex};
479479
480480
fn main() {
481-
let numbers = Arc::new(Mutex::new(vec![1is, 2, 3]));
481+
let numbers = Arc::new(Mutex::new(vec![1i, 2i, 3i]));
482482
483-
for i in 0..3 {
483+
for i in range(0u, 3u) {
484484
let number = numbers.clone();
485485
Thread::spawn(move || {
486486
let mut array = number.lock().unwrap();
@@ -541,12 +541,12 @@ safety check that makes this an error about moved values:
541541
use std::thread::Thread;
542542
543543
fn main() {
544-
let vec = vec![1is, 2, 3];
544+
let vec = vec![1i, 2, 3];
545545
546-
for i in 0us..3 {
546+
for i in range(0u, 3) {
547547
Thread::spawn(move || {
548548
println!("{}", vec[i]);
549-
});
549+
}).detach();
550550
}
551551
}
552552
```
@@ -557,9 +557,9 @@ you can remove it. As an example, this is a poor way to iterate through
557557
a vector:
558558
559559
```{rust}
560-
let vec = vec![1, 2, 3];
560+
let vec = vec![1i, 2, 3];
561561
562-
for i in 0..vec.len() {
562+
for i in range(0u, vec.len()) {
563563
println!("{}", vec[i]);
564564
}
565565
```
@@ -569,7 +569,7 @@ that we don't try to access an invalid index. However, we can remove this
569569
while retaining safety. The answer is iterators:
570570
571571
```{rust}
572-
let vec = vec![1, 2, 3];
572+
let vec = vec![1i, 2, 3];
573573
574574
for x in vec.iter() {
575575
println!("{}", x);

0 commit comments

Comments
 (0)