Skip to content

Commit 8801eab

Browse files
committed
---
yaml --- r: 181631 b: refs/heads/snap-stage3 c: 386d329 h: refs/heads/master i: 181629: a9e2b7c 181627: 199c20f 181623: 42c9d14 181615: e0a0c6e 181599: 641d30d 181567: 58e706c 181503: 56716d8 v: v3
1 parent 26bd950 commit 8801eab

File tree

640 files changed

+7852
-3869
lines changed

Some content is hidden

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

640 files changed

+7852
-3869
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: 6c065fc8cb036785f61ff03e05c1563cbb2dd081
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 0fe880bdb788032100b9cd1633770b56393784f6
4+
refs/heads/snap-stage3: 386d329ac5506f1e82c1e1095b12c30c3f990cc9
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/CONTRIBUTING.md

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

3-
If you're just reporting a bug, please see:
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:
46

5-
http://doc.rust-lang.org/complement-bugreport.html
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)
613

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

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).
17+
As a reminder, all contributors are expected to follow our [Code of Conduct](coc).
1218

13-
## Pull request procedure
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
1422

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:
23+
## Feature Requests
1824

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.
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.
2229

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.
30+
## Bug Reports
2731

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.
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.
3435

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.
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.
4041

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:
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:
4546

46-
```
47-
// Copyright 2010-2014 The Rust Project Developers.
47+
<short summary of the bug>
48+
49+
I tried this code:
50+
51+
<code sample that causes the bug>
52+
53+
I expected to see this happen: <explanation>
54+
55+
Instead, this happened: <explanation>
56+
57+
## Meta
58+
59+
`rustc --version --verbose`:
60+
61+
Backtrace:
62+
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 ...
4874
```
4975

50-
# Coordination and communication
76+
## Pull Requests
5177

52-
Get feedback from other developers on
53-
[internals.rust-lang.org][internals], and
54-
[#rust-internals][pound-rust-internals].
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.
5581

56-
[pound-rust-internals]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
57-
[internals]: http://internals.rust-lang.org
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].
146+
147+
Participate in the [RFC process](https://github.com/rust-lang/rfcs).
148+
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!
58152

59-
For more details, please refer to
60-
[Note-development-policy](https://github.com/rust-lang/rust/wiki/Note-development-policy).
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

branches/snap-stage3/README.md

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

33
This is a compiler for Rust, including standard libraries, tools and
4-
documentation.
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.
57

68
## Quick Start
79

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

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

1315
## Building from Source
1416

@@ -18,22 +20,15 @@ Read ["Installing Rust"][install] from [The Book][trpl].
1820
* GNU `make` 3.81 or later
1921
* `curl`
2022
* `git`
21-
2. Download and build Rust:
2223

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:
24+
2. Clone the [source] with `git`:
3225

3326
$ git clone https://github.com/rust-lang/rust.git
3427
$ cd rust
3528

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

3833
$ ./configure
3934
$ make && make install
@@ -45,7 +40,10 @@ Read ["Installing Rust"][install] from [The Book][trpl].
4540
4641
When complete, `make install` will place several programs into
4742
`/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the
48-
API-documentation tool.
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
4947

5048
### Building on Windows
5149

@@ -71,9 +69,6 @@ $ pacman -S base-devel
7169
$ ./configure
7270
$ make && make install
7371

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

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

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

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

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

10297
The Rust community congregates in a few places:
10398

10499
* [StackOverflow] - Direct questions about using the language here.
105100
* [users.rust-lang.org] - General discussion, broader questions.
106-
* [internals.rust-lang.org] - For development of the Rust language itself.
107101
* [/r/rust] - News and general discussion.
108102

109103
[StackOverflow]: http://stackoverflow.com/questions/tagged/rust
110104
[/r/rust]: http://reddit.com/r/rust
111105
[users.rust-lang.org]: http://users.rust-lang.org/
112-
[internals.rust-lang.org]: http://internals.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
113118

114119
## License
115120

branches/snap-stage3/configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,6 +1056,7 @@ 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
10591060
make_dir $h/test/compile-fail-fulldeps
10601061
make_dir $h/test/bench
10611062
make_dir $h/test/perf

branches/snap-stage3/mk/docs.mk

Lines changed: 8 additions & 2 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 complement-bugreport \
28+
DOCS := index intro tutorial \
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
76+
DOC_TARGETS := trpl style
7777
COMPILER_DOC_TARGETS :=
7878
DOC_L10N_TARGETS :=
7979

@@ -275,3 +275,9 @@ 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/snap-stage3/mk/install.mk

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

61-
# target platform specific variables
62-
# for arm-linux-androidabi
61+
# target platform specific variables for android
6362
define DEF_ADB_DEVICE_STATUS
6463
CFG_ADB_DEVICE_STATUS=$(1)
6564
endef
6665

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

120-
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD)))
121-
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-androideabi))
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+
))
122124

123125
install-runtime-target: \
124126
install-runtime-target-arm-linux-androideabi-cleanup \

branches/snap-stage3/mk/rt.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ 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 ($(OSTYPE_$(1)), linux-androideabi)
143-
JEMALLOC_ARGS_$(1) := --disable-tls
144-
else ifeq ($(OSTYPE_$(1)), linux-android)
142+
else ifeq ($(findstring android, $(OSTYPE_$(1))), android)
145143
JEMALLOC_ARGS_$(1) := --disable-tls
146144
endif
147145

0 commit comments

Comments
 (0)