Skip to content

Commit 1a9047a

Browse files
committed
---
yaml --- r: 184107 b: refs/heads/beta c: 0fe880b h: refs/heads/master i: 184105: 6780fb5 184103: 36af93b v: v3
1 parent 051c6ae commit 1a9047a

File tree

641 files changed

+3880
-7882
lines changed

Some content is hidden

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

641 files changed

+3880
-7882
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 754db0f7ac35edcddeb3e6a27969a7c3a380f936
34+
refs/heads/beta: 0fe880bdb788032100b9cd1633770b56393784f6
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: c65fb1a81e5dc58cf171cc47f65de9e6e2119247

branches/beta/CONTRIBUTING.md

Lines changed: 43 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,60 @@
1-
# Contributing to Rust
1+
## How to submit a bug report
22

3-
Thank you for your interest in contributing to Rust! There are many ways to
4-
contribute, and we appreciate all of them. This document is a bit long, so here's
5-
links to the major sections:
3+
If you're just reporting a bug, please see:
64

7-
* [Feature Requests](#feature-requests)
8-
* [Bug Reports](#bug-reports)
9-
* [Pull Requests](#pull-requests)
10-
* [Writing Documentation](#writing-documentation)
11-
* [Issue Triage](#issue-triage)
12-
* [Out-of-tree Contributions](#out-of-tree-contributions)
5+
http://doc.rust-lang.org/complement-bugreport.html
136

14-
If you have questions, please make a post on [internals.rust-lang.org][internals] or
15-
hop on [#rust-internals][pound-rust-internals].
7+
## Submitting an issue
168

17-
As a reminder, all contributors are expected to follow our [Code of Conduct](coc).
9+
Please submit issues here for bug reports or implementation details. For feature
10+
requests, language changes, or major changes to the libraries, please submit an
11+
issue against the [RFCs repository](https://github.com/rust-lang/rfcs).
1812

19-
[pound-rust-internals]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
20-
[internals]: http://internals.rust-lang.org
21-
[coc]: http://www.rust-lang.org/conduct.html
22-
23-
## Feature Requests
24-
25-
To request a change to the way that the Rust language works, please open an
26-
issue in the [RFCs repository](https://github.com/rust-lang/rfcs/issues/new)
27-
rather than this one. New features and other significant language changes
28-
must go through the RFC process.
29-
30-
## Bug Reports
31-
32-
While bugs are unfortunate, they're a reality in software. We can't fix what we
33-
don't know about, so please report liberally. If you're not sure if something
34-
is a bug or not, feel free to file a bug anyway.
35-
36-
If you have the chance, before reporting a bug, please [search existing
37-
issues](https://github.com/rust-lang/rust/search?q=&type=Issues&utf8=%E2%9C%93),
38-
as it's possible that someone else has already reported your error. This doesn't
39-
always work, and sometimes it's hard to know what to search for, so consider this
40-
extra credit. We won't mind if you accidentally file a duplicate report.
41-
42-
Opening an issue is as easy as following [this
43-
link](https://github.com/rust-lang/rust/issues/new) and filling out the fields.
44-
Here's a template that you can use to file a bug, though it's not necessary to
45-
use it exactly:
46-
47-
<short summary of the bug>
48-
49-
I tried this code:
13+
## Pull request procedure
5014

51-
<code sample that causes the bug>
15+
Pull requests should be targeted at Rust's `master` branch.
16+
Before pushing to your Github repo and issuing the pull request,
17+
please do two things:
5218

53-
I expected to see this happen: <explanation>
19+
1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your
20+
local changes against the `master` branch. Resolve any conflicts
21+
that arise.
5422

55-
Instead, this happened: <explanation>
23+
2. Run the full Rust test suite with the `make check` command. You're
24+
not off the hook even if you just stick to documentation; code
25+
examples in the docs are tested as well! Although for simple
26+
wording or grammar fixes, this is probably unnecessary.
5627

57-
## Meta
28+
Pull requests will be treated as "review requests", and we will give
29+
feedback we expect to see corrected on
30+
[style](http://aturon.github.io/) and
31+
substance before pulling. Changes contributed via pull request should
32+
focus on a single issue at a time, like any other. We will not accept
33+
pull-requests that try to "sneak" unrelated changes in.
5834

59-
`rustc --version --verbose`:
35+
Normally, all pull requests must include regression tests (see
36+
[Note-testsuite](https://github.com/rust-lang/rust/wiki/Note-testsuite))
37+
that test your change. Occasionally, a change will be very difficult
38+
to test for. In those cases, please include a note in your commit
39+
message explaining why.
6040

61-
Backtrace:
41+
In the licensing header at the beginning of any files you change,
42+
please make sure the listed date range includes the current year. For
43+
example, if it's 2014, and you change a Rust file that was created in
44+
2010, it should begin:
6245

63-
All three components are important: what you did, what you expected, what
64-
happened instead. Please include the output of `rustc --version --verbose`,
65-
which includes important information about what platform you're on, what
66-
version of Rust you're using, etc.
67-
68-
Sometimes, a backtrace is helpful, and so including that is nice. To get
69-
a backtrace, set the `RUST_BACKTRACE` environment variable. The easiest way
70-
to do this is to invoke `rustc` like this:
71-
72-
```bash
73-
$ RUST_BACKTRACE=1 rustc ...
46+
```
47+
// Copyright 2010-2014 The Rust Project Developers.
7448
```
7549

76-
## Pull Requests
77-
78-
Pull requests are the primary mechanism we use to change Rust. GitHub itself
79-
has some [great documentation][pull-requests] on using the Pull Request
80-
feature. We use the 'fork and pull' model described there.
81-
82-
[pull-requests]: https://help.github.com/articles/using-pull-requests/
83-
84-
Please make pull requests against the `master` branch.
85-
86-
All pull requests are reviewed by another person. We have a bot,
87-
@rust-highfive, that will automatically assign a random person to review your request.
88-
89-
If you want to request that a specific person reviews your pull request,
90-
you can add an `r?` to the message. For example, Steve usually reviews
91-
documentation changes. So if you were to make a documentation change, add
92-
93-
r? @steveklabnik
94-
95-
to the end of the message, and @rust-highfive will assign @steveklabnik instead
96-
of a random person. This is entirely optional.
97-
98-
After someone has reviewed your pull request, they will leave an annotation
99-
on the pull request with an `r+`. It will look something like this:
100-
101-
@bors: r+ 38fe8d2
102-
103-
This tells @bors, our lovable integration bot, that your pull request has
104-
been approved. The PR then enters the [merge queue][merge-queue], where @bors
105-
will run all the tests on every platform we support. If it all works out,
106-
@bors will merge your code into `master` and close the pull request.
107-
108-
[merge-queue]: http://buildbot.rust-lang.org/homu/queue/rust
109-
110-
## Writing Documentation
111-
112-
Documentation improvements are very welcome. The source of `doc.rust-lang.org`
113-
is located in `src/doc` in the tree, and standard API documentation is generated
114-
from the source code itself.
115-
116-
Documentation pull requests function in the same as other pull requests, though
117-
you may see a slightly different form of `r+`:
118-
119-
@bors: r+ 38fe8d2 rollup
120-
121-
That additional `rollup` tells @bors that this change is eligible for a 'rollup'.
122-
To save @bors some work, and to get small changes through more quickly, when
123-
@bors attempts to merge a commit that's rollup-eligible, it will also merge
124-
the other rollup-eligible patches too, and they'll get tested and merged at
125-
the same time.
126-
127-
## Issue Triage
128-
129-
Sometimes, an issue will stay open, even though the bug has been fixed. And
130-
sometimes, the original bug may go stale because something has changed in the
131-
meantime.
132-
133-
It can be helpful to go through older bug reports and make sure that they are
134-
still valid. Load up an older issue, double check that it's still true, and
135-
leave a comment letting us know if it is or is not. The [least recently updated sort][lru] is good for finding issues like this.
136-
137-
[lru]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
138-
139-
## Out-of-tree Contributions
140-
141-
There are a number of other ways to contribute to Rust that don't deal with
142-
this repository.
143-
144-
Answer questions in [#rust][pound-rust], or on [users.rust-lang.org][users],
145-
or on [StackOverflow][so].
50+
# Coordination and communication
14651

147-
Participate in the [RFC process](https://github.com/rust-lang/rfcs).
52+
Get feedback from other developers on
53+
[internals.rust-lang.org][internals], and
54+
[#rust-internals][pound-rust-internals].
14855

149-
Find a [requested community library][community-library], build it, and publish
150-
it to [Crates.io](http://crates.io). Easier said than done, but very, very
151-
valuable!
56+
[pound-rust-internals]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
57+
[internals]: http://internals.rust-lang.org
15258

153-
[pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
154-
[users]: http://users.rust-lang.org/
155-
[so]: http://stackoverflow.com/questions/tagged/rust
156-
[community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library
59+
For more details, please refer to
60+
[Note-development-policy](https://github.com/rust-lang/rust/wiki/Note-development-policy).

branches/beta/README.md

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
# The Rust Programming Language
22

33
This is a compiler for Rust, including standard libraries, tools and
4-
documentation. Rust is a systems programming language that is fast,
5-
memory safe and multithreaded, but does not employ a garbage collector
6-
or otherwise impose significant runtime overhead.
4+
documentation.
75

86
## Quick Start
97

10-
Read ["Installing Rust"] from [The Book].
8+
Read ["Installing Rust"][install] from [The Book][trpl].
119

12-
["Installing Rust"]: http://doc.rust-lang.org/book/installing-rust.html
13-
[The Book]: http://doc.rust-lang.org/book/index.html
10+
[install]: http://doc.rust-lang.org/book/installing-rust.html
11+
[trpl]: http://doc.rust-lang.org/book/index.html
1412

1513
## Building from Source
1614

@@ -20,15 +18,22 @@ Read ["Installing Rust"] from [The Book].
2018
* GNU `make` 3.81 or later
2119
* `curl`
2220
* `git`
21+
2. Download and build Rust:
2322

24-
2. Clone the [source] with `git`:
23+
You can either download a [tarball] or build directly from the [repo].
24+
25+
To build from the [tarball] do:
26+
27+
$ curl -O https://static.rust-lang.org/dist/rustc-nightly-src.tar.gz
28+
$ tar -xzf rustc-nightly-src.tar.gz
29+
$ cd rustc-nightly
30+
31+
Or to build from the [repo] do:
2532

2633
$ git clone https://github.com/rust-lang/rust.git
2734
$ cd rust
2835

29-
[source]: https://github.com/rust-lang/rust
30-
31-
3. Build and install:
36+
Now that you have Rust's source code, you can configure and build it:
3237

3338
$ ./configure
3439
$ make && make install
@@ -40,10 +45,7 @@ Read ["Installing Rust"] from [The Book].
4045
4146
When complete, `make install` will place several programs into
4247
`/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the
43-
API-documentation tool. This install does not include [Cargo],
44-
Rust's package manager, which you may also want to build.
45-
46-
[Cargo]: https://github.com/rust-lang/cargo
48+
API-documentation tool.
4749

4850
### Building on Windows
4951

@@ -69,6 +71,9 @@ $ pacman -S base-devel
6971
$ ./configure
7072
$ make && make install
7173

74+
[repo]: https://github.com/rust-lang/rust
75+
[tarball]: https://static.rust-lang.org/dist/rustc-nightly-src.tar.gz
76+
7277
## Notes
7378

7479
Since the Rust compiler is written in Rust, it must be built by a
@@ -88,33 +93,23 @@ supported build environments that are most likely to work.
8893
Rust currently needs about 1.5 GiB of RAM to build without swapping; if it hits
8994
swap, it will take a very long time to build.
9095

91-
There is more advice about hacking on Rust in [CONTRIBUTING.md].
96+
There is a lot more documentation in the [wiki].
9297

93-
[CONTRIBUTING.md]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
98+
[wiki]: https://github.com/rust-lang/rust/wiki
9499

95-
## Getting help
100+
## Getting help and getting involved
96101

97102
The Rust community congregates in a few places:
98103

99104
* [StackOverflow] - Direct questions about using the language here.
100105
* [users.rust-lang.org] - General discussion, broader questions.
106+
* [internals.rust-lang.org] - For development of the Rust language itself.
101107
* [/r/rust] - News and general discussion.
102108

103109
[StackOverflow]: http://stackoverflow.com/questions/tagged/rust
104110
[/r/rust]: http://reddit.com/r/rust
105111
[users.rust-lang.org]: http://users.rust-lang.org/
106-
107-
## Contributing
108-
109-
To contribute to Rust, please see [CONTRIBUTING.md](CONTRIBUTING.md).
110-
111-
Rust has an [IRC] culture and most real-time collaboration happens in a
112-
variety of channels on Mozilla's IRC network, irc.mozilla.org. The
113-
most popular channel is [#rust], a venue for general discussion about
114-
Rust, and a good place to ask for help,
115-
116-
[IRC]: https://en.wikipedia.org/wiki/Internet_Relay_Chat
117-
[#rust]: irc://irc.mozilla.org/rust
112+
[internals.rust-lang.org]: http://internals.rust-lang.org/
118113

119114
## License
120115

branches/beta/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,6 @@ do
10561056
make_dir $h/test/run-pass-fulldeps
10571057
make_dir $h/test/run-fail
10581058
make_dir $h/test/compile-fail
1059-
make_dir $h/test/parse-fail
10601059
make_dir $h/test/compile-fail-fulldeps
10611060
make_dir $h/test/bench
10621061
make_dir $h/test/perf

branches/beta/mk/docs.mk

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# L10N_LANGS are the languages for which the docs have been
2626
# translated.
2727
######################################################################
28-
DOCS := index intro tutorial \
28+
DOCS := index intro tutorial complement-bugreport \
2929
complement-lang-faq complement-design-faq complement-project-faq \
3030
rustdoc reference grammar
3131

@@ -73,7 +73,7 @@ RUSTBOOK = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTBOOK_EXE)
7373

7474
D := $(S)src/doc
7575

76-
DOC_TARGETS := trpl style
76+
DOC_TARGETS := trpl
7777
COMPILER_DOC_TARGETS :=
7878
DOC_L10N_TARGETS :=
7979

@@ -275,9 +275,3 @@ trpl: doc/book/index.html
275275
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
276276
$(Q)rm -rf doc/book
277277
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
278-
279-
style: doc/style/index.html
280-
281-
doc/style/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/style/*.md) | doc/
282-
$(Q)rm -rf doc/style
283-
$(Q)$(RUSTBOOK) build $(S)src/doc/style doc/style

branches/beta/mk/install.mk

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,14 @@ tmp/empty_dir:
5858
# Android runtime setup
5959
# FIXME: This probably belongs somewhere else
6060

61-
# target platform specific variables for android
61+
# target platform specific variables
62+
# for arm-linux-androidabi
6263
define DEF_ADB_DEVICE_STATUS
6364
CFG_ADB_DEVICE_STATUS=$(1)
6465
endef
6566

6667
$(foreach target,$(CFG_TARGET), \
67-
$(if $(findstring android, $(target)), \
68+
$(if $(findstring $(target),"arm-linux-androideabi"), \
6869
$(if $(findstring adb,$(CFG_ADB)), \
6970
$(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[_A-Za-z0-9-]+[[:blank:]]+device')), \
7071
$(info install: install-runtime-target for $(target) enabled \
@@ -116,11 +117,8 @@ install-runtime-target-$(1)-cleanup:
116117
$$(call ADB_SHELL,rm,$$(CFG_RUNTIME_PUSH_DIR)/$$(call CFG_LIB_GLOB_$(1),$$(crate)));)
117118
endef
118119

119-
$(foreach target,$(CFG_TARGET), \
120-
$(if $(findstring $(CFG_ADB_DEVICE_STATUS),"true"), \
121-
$(eval $(call INSTALL_RUNTIME_TARGET_N,$(taget),$(CFG_BUILD))) \
122-
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,$(target))) \
123-
))
120+
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD)))
121+
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-androideabi))
124122

125123
install-runtime-target: \
126124
install-runtime-target-arm-linux-androideabi-cleanup \

branches/beta/mk/rt.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ ifeq ($$(CFG_WINDOWSY_$(1)), 1)
139139
JEMALLOC_ARGS_$(1) := --enable-lazy-lock
140140
else ifeq ($(OSTYPE_$(1)), apple-ios)
141141
JEMALLOC_ARGS_$(1) := --disable-tls
142-
else ifeq ($(findstring android, $(OSTYPE_$(1))), android)
142+
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
143+
JEMALLOC_ARGS_$(1) := --disable-tls
144+
else ifeq ($(OSTYPE_$(1)), linux-android)
143145
JEMALLOC_ARGS_$(1) := --disable-tls
144146
endif
145147

0 commit comments

Comments
 (0)