Skip to content

Commit c8b981a

Browse files
committed
---
yaml --- r: 183789 b: refs/heads/beta c: eca2453 h: refs/heads/master i: 183787: 45d78d9 v: v3
1 parent 03bbbe5 commit c8b981a

File tree

532 files changed

+18715
-8309
lines changed

Some content is hidden

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

532 files changed

+18715
-8309
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: 4a9dd3f8403f84ad518b0119fa2312c379df5dd7
34+
refs/heads/beta: eca2453a02548042fcb7082063149367a3343dd7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/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/beta/README.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,10 @@ documentation.
55

66
## Quick Start
77

8-
1. Download a [binary installer][installer] for your platform.
9-
2. Read [The Rust Programming Language][trpl].
10-
3. Enjoy!
8+
Read ["Installing Rust"][install] from [The Book][trpl].
119

12-
> ***Note:*** Windows users can read the detailed
13-
> [using Rust on Windows][win-wiki] notes on the wiki.
14-
15-
[installer]: http://www.rust-lang.org/install.html
10+
[install]: http://doc.rust-lang.org/book/installing-rust.html
1611
[trpl]: http://doc.rust-lang.org/book/index.html
17-
[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows
1812

1913
## Building from Source
2014

@@ -24,6 +18,7 @@ documentation.
2418
* GNU `make` 3.81 or later
2519
* `curl`
2620
* `git`
21+
2722
2. Download and build Rust:
2823

2924
You can either download a [tarball] or build directly from the [repo].
@@ -52,8 +47,6 @@ documentation.
5247
When complete, `make install` will place several programs into
5348
`/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the
5449
API-documentation tool.
55-
3. Read [The Rust Programming Language][trpl].
56-
4. Enjoy!
5750

5851
### Building on Windows
5952

@@ -81,7 +74,6 @@ $ pacman -S base-devel
8174

8275
[repo]: https://github.com/rust-lang/rust
8376
[tarball]: https://static.rust-lang.org/dist/rustc-nightly-src.tar.gz
84-
[trpl]: http://doc.rust-lang.org/book/index.html
8577

8678
## Notes
8779

@@ -106,19 +98,21 @@ There is a lot more documentation in the [wiki].
10698

10799
[wiki]: https://github.com/rust-lang/rust/wiki
108100

109-
## Getting help and getting involved
101+
## Getting help
110102

111103
The Rust community congregates in a few places:
112104

113105
* [StackOverflow] - Direct questions about using the language here.
114106
* [users.rust-lang.org] - General discussion, broader questions.
115-
* [internals.rust-lang.org] - For development of the Rust language itself.
116107
* [/r/rust] - News and general discussion.
117108

118109
[StackOverflow]: http://stackoverflow.com/questions/tagged/rust
119110
[/r/rust]: http://reddit.com/r/rust
120111
[users.rust-lang.org]: http://users.rust-lang.org/
121-
[internals.rust-lang.org]: http://internals.rust-lang.org/
112+
113+
## Contributing
114+
115+
To contribute to Rust, please see [CONTRIBUTING.md](CONTRIBUTING.md).
122116

123117
## License
124118

branches/beta/configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,8 @@ do
13791379
done
13801380

13811381
# Munge any paths that appear in config.mk back to posix-y
1382-
sed -i.bak -e 's@ \([a-zA-Z]\):[/\\]@ /\1/@g;' config.tmp
1382+
cp config.tmp config.tmp.bak
1383+
sed -e 's@ \([a-zA-Z]\):[/\\]@ /\1/@g;' <config.tmp.bak >config.tmp
13831384
rm -f config.tmp.bak
13841385

13851386
msg

branches/beta/mk/dist.mk

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ distcheck-tar-src: dist-tar-src
109109
# Unix binary installer tarballs
110110
######################################################################
111111

112-
NON_INSTALLED_PREFIXES=COPYRIGHT,LICENSE-APACHE,LICENSE-MIT,README.md,version
113-
114112
define DEF_INSTALLER
115113

116114
$$(eval $$(call DEF_PREPARE,dir-$(1)))
@@ -124,19 +122,23 @@ dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
124122
dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
125123
dist-install-dir-$(1): PREPARE_CLEAN=true
126124
dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
127-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR)
128-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)
129-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)
130-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)
131125
$$(Q)mkdir -p $$(PREPARE_DEST_DIR)/share/doc/rust
132126
$$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR)/share/doc/rust
133127
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)/share/doc/rust
134128
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)/share/doc/rust
135129
$$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)/share/doc/rust
130+
131+
prepare-overlay-$(1):
132+
$$(Q)rm -Rf tmp/dist/$$(PKG_NAME)-$(1)-overlay
133+
$$(Q)mkdir -p tmp/dist/$$(PKG_NAME)-$(1)-overlay
134+
$$(Q)cp $$(S)COPYRIGHT tmp/dist/$$(PKG_NAME)-$(1)-overlay/
135+
$$(Q)cp $$(S)LICENSE-APACHE tmp/dist/$$(PKG_NAME)-$(1)-overlay/
136+
$$(Q)cp $$(S)LICENSE-MIT tmp/dist/$$(PKG_NAME)-$(1)-overlay/
137+
$$(Q)cp $$(S)README.md tmp/dist/$$(PKG_NAME)-$(1)-overlay/
136138
# This tiny morsel of metadata is used by rust-packaging
137-
$$(Q)echo "$(CFG_VERSION)" > $$(PREPARE_DEST_DIR)/version
139+
$$(Q)echo "$(CFG_VERSION)" > tmp/dist/$$(PKG_NAME)-$(1)-overlay/version
138140

139-
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
141+
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) prepare-overlay-$(1)
140142
@$(call E, build: $$@)
141143
# Copy essential gcc components into installer
142144
ifdef CFG_WINDOWSY_$(1)
@@ -146,13 +148,12 @@ ifdef CFG_WINDOWSY_$(1)
146148
endif
147149
$$(Q)$$(S)src/rust-installer/gen-installer.sh \
148150
--product-name=Rust \
149-
--verify-bin=rustc \
150151
--rel-manifest-dir=rustlib \
151152
--success-message=Rust-is-ready-to-roll. \
152153
--image-dir=tmp/dist/$$(PKG_NAME)-$(1)-image \
153154
--work-dir=tmp/dist \
154155
--output-dir=dist \
155-
--non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
156+
--non-installed-overlay=tmp/dist/$$(PKG_NAME)-$(1)-overlay \
156157
--package-name=$$(PKG_NAME)-$(1) \
157158
--component-name=rustc \
158159
--legacy-manifest-dirs=rustlib,cargo

branches/beta/mk/docs.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
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 \
30-
rustdoc reference
30+
rustdoc reference grammar
3131

3232
# Legacy guides, preserved for a while to reduce the number of 404s
3333
DOCS += guide-crates guide-error-handling guide-ffi guide-macros guide \
@@ -129,21 +129,21 @@ doc/:
129129
HTML_DEPS += doc/rust.css
130130
doc/rust.css: $(D)/rust.css | doc/
131131
@$(call E, cp: $@)
132-
$(Q)cp -a $< $@ 2> /dev/null
132+
$(Q)cp -PRp $< $@ 2> /dev/null
133133

134134
HTML_DEPS += doc/favicon.inc
135135
doc/favicon.inc: $(D)/favicon.inc | doc/
136136
@$(call E, cp: $@)
137-
$(Q)cp -a $< $@ 2> /dev/null
137+
$(Q)cp -PRp $< $@ 2> /dev/null
138138

139139
doc/full-toc.inc: $(D)/full-toc.inc | doc/
140140
@$(call E, cp: $@)
141-
$(Q)cp -a $< $@ 2> /dev/null
141+
$(Q)cp -PRp $< $@ 2> /dev/null
142142

143143
HTML_DEPS += doc/footer.inc
144144
doc/footer.inc: $(D)/footer.inc | doc/
145145
@$(call E, cp: $@)
146-
$(Q)cp -a $< $@ 2> /dev/null
146+
$(Q)cp -PRp $< $@ 2> /dev/null
147147

148148
# The (english) documentation for each doc item.
149149

0 commit comments

Comments
 (0)