Skip to content

Commit 4c4a609

Browse files
committed
---
yaml --- r: 275765 b: refs/heads/auto c: 2fd2670 h: refs/heads/master i: 275763: 84a2a1f
1 parent 08419cb commit 4c4a609

File tree

2,348 files changed

+141853
-96487
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,348 files changed

+141853
-96487
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: c2aaad4e2288647c5235754a5e1439a5124978fe
11+
refs/heads/auto: 2fd2670ea0a55b7f7481c5ce2a95c5c5033941d5
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: 4 additions & 9 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
@@ -132,12 +131,8 @@ Some common make targets are:
132131
& everything builds in the correct manner.
133132
- `make check-stage1-std NO_REBUILD=1` - test the standard library without
134133
rebuilding the entire compiler
135-
- `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.
138-
`TESTNAME=collections::hash::map::test_map::test_capacity_not_less_than_len`
139-
or `TESTNAME=test_capacity_not_less_than_len`.
140-
- `make check-stage1-rpass TESTNAME=<substring-of-test-name>` - Run a single
134+
- `make check TESTNAME=<path-to-test-file>.rs` - Run a single test file
135+
- `make check-stage1-rpass TESTNAME=<path-to-test-file>.rs` - Run a single
141136
rpass test with the stage1 compiler (this will be quicker than running the
142137
command above as we only build the stage1 compiler, not the entire thing).
143138
You can also leave off the `-rpass` to run all stage1 test types.
@@ -307,7 +302,7 @@ are:
307302
[gsearchdocs]: https://www.google.com/search?q=site:doc.rust-lang.org+your+query+here
308303
[rif]: http://internals.rust-lang.org
309304
[rr]: https://doc.rust-lang.org/book/README.html
310-
[tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
305+
[tlgba]: http://tomlee.co/2014/04/03/a-more-detailed-tour-of-the-rust-compiler/
311306
[ro]: http://www.rustaceans.org/
312307
[rctd]: ./COMPILER_TESTS.md
313308
[cheatsheet]: http://buildbot.rust-lang.org/homu/

branches/auto/COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ terms.
66

77
Longer version:
88

9-
The Rust Project is copyright 2010, The Rust Project
9+
The Rust Project is copyright 2016, The Rust Project
1010
Developers.
1111

1212
Licensed under the Apache License, Version 2.0

branches/auto/LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2010 The Rust Project Developers
1+
Copyright (c) 2016 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/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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ and documentation.
99

1010
Read ["Installing Rust"] from [The Book].
1111

12-
["Installing Rust"]: https://doc.rust-lang.org/book/getting-started.html#installing-rust
12+
["Installing Rust"]: https://doc.rust-lang.org/book/installing-rust.html
1313
[The Book]: https://doc.rust-lang.org/book/index.html
1414

1515
## Building from Source
1616

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)