Skip to content

Commit 5868edd

Browse files
committed
---
yaml --- r: 275559 b: refs/heads/auto c: 762d4ac h: refs/heads/master i: 275557: 1c34385 275555: 1612a9e 275551: c4d7af5
1 parent ae8098a commit 5868edd

File tree

2,223 files changed

+51718
-85838
lines changed

Some content is hidden

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

2,223 files changed

+51718
-85838
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: f207ddb9bf22b5832e660183aee74c6356edee1c
11+
refs/heads/auto: 762d4ac734e096e8e4ea9fdeb23cf6ce9965d2c3
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*.elc
1818
*.epub
1919
*.exe
20-
*.pdb
2120
*.fn
2221
*.html
2322
*.kdev4
@@ -78,7 +77,6 @@
7877
/stage3/
7978
/test/
8079
/tmp/
81-
/obj/
8280
TAGS
8381
TAGS.emacs
8482
TAGS.vi
@@ -95,4 +93,3 @@ tmp.*.rs
9593
version.md
9694
version.ml
9795
version.texi
98-
/target

branches/auto/.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
url = https://github.com/rust-lang/rust-installer.git
1717
[submodule "src/liblibc"]
1818
path = src/liblibc
19-
url = https://github.com/rust-lang/libc.git
19+
url = https://github.com/rust-lang-nursery/libc.git

branches/auto/.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Gareth Daniel Smith <garethdanielsmith@gmail.com> Gareth Smith <garethdanielsmit
8282
Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
8383
Graham Fawcett <graham.fawcett@gmail.com> Graham Fawcett <fawcett@uwindsor.ca>
8484
Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
85-
Guillaume Gomez <guillaume1.gomez@gmail.com> Guillaume Gomez <ggomez@ggo.ifr.lan>
85+
Guillaume Gomez <guillaume1.gomez@gmail.com>
8686
Heather <heather@cynede.net> <Cynede@Gentoo.org>
8787
Heather <heather@cynede.net> <Heather@cynede.net>
8888
Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtke@gmail.com>

branches/auto/COMPILER_TESTS.md

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,43 +42,3 @@ whole, instead of just a few lines inside the test.
4242
* `ignore-test` always ignores the test
4343
* `ignore-lldb` and `ignore-gdb` will skip the debuginfo tests
4444
* `min-{gdb,lldb}-version`
45-
* `should-fail` indicates that the test should fail; used for "meta testing",
46-
where we test the compiletest program itself to check that it will generate
47-
errors in appropriate scenarios. This header is ignored for pretty-printer tests.
48-
49-
## Revisions
50-
51-
Certain classes of tests support "revisions" (as of the time of this
52-
writing, this includes run-pass, compile-fail, run-fail, and
53-
incremental, though incremental tests are somewhat
54-
different). Revisions allow a single test file to be used for multiple
55-
tests. This is done by adding a special header at the top of the file:
56-
57-
```
58-
// revisions: foo bar baz
59-
```
60-
61-
This will result in the test being compiled (and tested) three times,
62-
once with `--cfg foo`, once with `--cfg bar`, and once with `--cfg
63-
baz`. You can therefore use `#[cfg(foo)]` etc within the test to tweak
64-
each of these results.
65-
66-
You can also customize headers and expected error messages to a particular
67-
revision. To do this, add `[foo]` (or `bar`, `baz`, etc) after the `//`
68-
comment, like so:
69-
70-
```
71-
// A flag to pass in only for cfg `foo`:
72-
//[foo]compile-flags: -Z verbose
73-
74-
#[cfg(foo)]
75-
fn test_foo() {
76-
let x: usize = 32_u32; //[foo]~ ERROR mismatched types
77-
}
78-
```
79-
80-
Note that not all headers have meaning when customized to a revision.
81-
For example, the `ignore-test` header (and all "ignore" headers)
82-
currently only apply to the test as a whole, not to particular
83-
revisions. The only headers that are intended to really work when
84-
customized to a revision are error patterns and compiler flags.

branches/auto/CONTRIBUTING.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ which includes important information about what platform you're on, what
7171
version of Rust you're using, etc.
7272

7373
Sometimes, a backtrace is helpful, and so including that is nice. To get
74-
a backtrace, set the `RUST_BACKTRACE` environment variable to a value
75-
other than `0`. The easiest way
74+
a backtrace, set the `RUST_BACKTRACE` environment variable. The easiest way
7675
to do this is to invoke `rustc` like this:
7776

7877
```bash
@@ -133,8 +132,8 @@ Some common make targets are:
133132
- `make check-stage1-std NO_REBUILD=1` - test the standard library without
134133
rebuilding the entire compiler
135134
- `make check TESTNAME=<substring-of-test-name>` - Run a matching set of tests.
136-
- `TESTNAME` should be a substring of the tests to match against e.g. it could
137-
be the fully qualified test name, or just a part of it.
135+
- `TESTNAME` should be a substring of the tests to match against e.g. it could
136+
be the fully qualified test name, or just a part of it.
138137
`TESTNAME=collections::hash::map::test_map::test_capacity_not_less_than_len`
139138
or `TESTNAME=test_capacity_not_less_than_len`.
140139
- `make check-stage1-rpass TESTNAME=<substring-of-test-name>` - Run a single

branches/auto/Makefile.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@
100100
# // Having trouble figuring out which test is failing? Turn off parallel tests
101101
# make check-stage1-std RUST_TEST_THREADS=1
102102
#
103-
# // To make debug!() and other logging calls visible, reconfigure:
104-
# ./configure --enable-debug-assertions
105-
# make ....
106-
#
107103
# If you really feel like getting your hands dirty, then:
108104
#
109105
# run `make nitty-gritty`

branches/auto/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Read ["Installing Rust"] from [The Book].
1717
1. Make sure you have installed the dependencies:
1818

1919
* `g++` 4.7 or `clang++` 3.x
20-
* `python` 2.7 (but not 3.x)
20+
* `python` 2.7 or later (but not 3.x)
2121
* GNU `make` 3.81 or later
2222
* `curl`
2323
* `git`
@@ -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. 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
@@ -177,11 +177,10 @@ To contribute to Rust, please see [CONTRIBUTING](CONTRIBUTING.md).
177177
Rust has an [IRC] culture and most real-time collaboration happens in a
178178
variety of channels on Mozilla's IRC network, irc.mozilla.org. The
179179
most popular channel is [#rust], a venue for general discussion about
180-
Rust. And a good place to ask for help would be [#rust-beginners].
180+
Rust, and a good place to ask for help.
181181
182182
[IRC]: https://en.wikipedia.org/wiki/Internet_Relay_Chat
183183
[#rust]: irc://irc.mozilla.org/rust
184-
[#rust-beginners]: irc://irc.mozilla.org/rust-beginners
185184
186185
## License
187186

0 commit comments

Comments
 (0)