Skip to content

Commit 2c3d11e

Browse files
committed
---
yaml --- r: 181239 b: refs/heads/auto c: 96bea5e h: refs/heads/master i: 181237: 70935ab 181235: 128e10a 181231: 198139a v: v3
1 parent f0e060d commit 2c3d11e

File tree

480 files changed

+9730
-11202
lines changed

Some content is hidden

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

480 files changed

+9730
-11202
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: eca2453a02548042fcb7082063149367a3343dd7
13+
refs/heads/auto: 96bea5eb72d397d30f4717ab63cc868f974d453b
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

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

66
## Quick Start
77

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

10-
[install]: http://doc.rust-lang.org/book/installing-rust.html
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
1116
[trpl]: http://doc.rust-lang.org/book/index.html
17+
[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows
1218

1319
## Building from Source
1420

@@ -18,7 +24,6 @@ Read ["Installing Rust"][install] from [The Book][trpl].
1824
* GNU `make` 3.81 or later
1925
* `curl`
2026
* `git`
21-
2227
2. Download and build Rust:
2328

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

5158
### Building on Windows
5259

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

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

7886
## Notes
7987

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

99107
[wiki]: https://github.com/rust-lang/rust/wiki
100108

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

103111
The Rust community congregates in a few places:
104112

105113
* [StackOverflow] - Direct questions about using the language here.
106114
* [users.rust-lang.org] - General discussion, broader questions.
115+
* [internals.rust-lang.org] - For development of the Rust language itself.
107116
* [/r/rust] - News and general discussion.
108117

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

117123
## License
118124

branches/auto/mk/dist.mk

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ 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+
112114
define DEF_INSTALLER
113115

114116
$$(eval $$(call DEF_PREPARE,dir-$(1)))
@@ -122,23 +124,19 @@ dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
122124
dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
123125
dist-install-dir-$(1): PREPARE_CLEAN=true
124126
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)
125131
$$(Q)mkdir -p $$(PREPARE_DEST_DIR)/share/doc/rust
126132
$$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR)/share/doc/rust
127133
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)/share/doc/rust
128134
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)/share/doc/rust
129135
$$(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/
138136
# This tiny morsel of metadata is used by rust-packaging
139-
$$(Q)echo "$(CFG_VERSION)" > tmp/dist/$$(PKG_NAME)-$(1)-overlay/version
137+
$$(Q)echo "$(CFG_VERSION)" > $$(PREPARE_DEST_DIR)/version
140138

141-
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) prepare-overlay-$(1)
139+
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
142140
@$(call E, build: $$@)
143141
# Copy essential gcc components into installer
144142
ifdef CFG_WINDOWSY_$(1)
@@ -148,12 +146,13 @@ ifdef CFG_WINDOWSY_$(1)
148146
endif
149147
$$(Q)$$(S)src/rust-installer/gen-installer.sh \
150148
--product-name=Rust \
149+
--verify-bin=rustc \
151150
--rel-manifest-dir=rustlib \
152151
--success-message=Rust-is-ready-to-roll. \
153152
--image-dir=tmp/dist/$$(PKG_NAME)-$(1)-image \
154153
--work-dir=tmp/dist \
155154
--output-dir=dist \
156-
--non-installed-overlay=tmp/dist/$$(PKG_NAME)-$(1)-overlay \
155+
--non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
157156
--package-name=$$(PKG_NAME)-$(1) \
158157
--component-name=rustc \
159158
--legacy-manifest-dirs=rustlib,cargo

branches/auto/mk/docs.mk

Lines changed: 13 additions & 7 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 \
28+
DOCS := index intro tutorial complement-bugreport \
2929
complement-lang-faq complement-design-faq complement-project-faq \
30-
rustdoc reference grammar
30+
rustdoc reference
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 \
@@ -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

@@ -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 -PRp $< $@ 2> /dev/null
132+
$(Q)cp -a $< $@ 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 -PRp $< $@ 2> /dev/null
137+
$(Q)cp -a $< $@ 2> /dev/null
138138

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

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

@@ -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

0 commit comments

Comments
 (0)