Skip to content

Commit 69a7bbd

Browse files
committed
---
yaml --- r: 225649 b: refs/heads/stable c: 021e483 h: refs/heads/master i: 225647: 59341cd v: v3
1 parent 7221201 commit 69a7bbd

File tree

515 files changed

+9411
-13313
lines changed

Some content is hidden

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

515 files changed

+9411
-13313
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: a35ea4d35837c5cffbf4fe81c00e94092c35d5fe
32+
refs/heads/stable: 021e48326db304559a74f2f338d511f9674d0da7
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ Hajime Morrita <[email protected]>
338338
Hanno Braun <[email protected]>
339339
Harry Marr <[email protected]>
340340
341-
Heejong Ahn <[email protected]>
341+
Heejong Ahn <[email protected]
342342
Henrik Schopmans <[email protected]>
343343
Herman J. Radtke III <[email protected]>
344344
HeroesGrave <[email protected]>

branches/stable/CONTRIBUTING.md

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ feature. We use the 'fork and pull' model described there.
8484
Please make pull requests against the `master` branch.
8585

8686
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
88-
request.
87+
@rust-highfive, that will automatically assign a random person to review your request.
8988

9089
If you want to request that a specific person reviews your pull request,
9190
you can add an `r?` to the message. For example, Steve usually reviews
@@ -125,10 +124,6 @@ To save @bors some work, and to get small changes through more quickly, when
125124
the other rollup-eligible patches too, and they'll get tested and merged at
126125
the same time.
127126

128-
To find documentation-related issues, sort by the [A-docs label][adocs].
129-
130-
[adocs]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AA-docs
131-
132127
## Issue Triage
133128

134129
Sometimes, an issue will stay open, even though the bug has been fixed. And
@@ -137,40 +132,8 @@ meantime.
137132

138133
It can be helpful to go through older bug reports and make sure that they are
139134
still valid. Load up an older issue, double check that it's still true, and
140-
leave a comment letting us know if it is or is not. The [least recently
141-
updated sort][lru] is good for finding issues like this.
142-
143-
Contributors with sufficient permissions on the Rust repo can help by adding
144-
labels to triage issues:
145-
146-
* Yellow, **A**-prefixed labels state which **area** of the project an issue
147-
relates to.
148-
149-
* Magenta, **B**-prefixed labels identify bugs which **belong** elsewhere.
150-
151-
* Green, **E**-prefixed labels explain the level of **experience** necessary
152-
to fix the issue.
153-
154-
* Red, **I**-prefixed labels indicate the **importance** of the issue. The
155-
[I-nominated][inom] label indicates that an issue has been nominated for
156-
prioritizing at the next triage meeting.
157-
158-
* Orange, **P**-prefixed labels indicate a bug's **priority**. These labels
159-
are only assigned during triage meetings, and replace the [I-nominated][inom]
160-
label.
161-
162-
* Blue, **T**-prefixed bugs denote which **team** the issue belongs to.
163-
164-
* Dark blue, **beta-** labels track changes which need to be backported into
165-
the beta branches.
166-
167-
* The purple **metabug** label marks lists of bugs collected by other
168-
categories.
169-
170-
If you're looking for somewhere to start, check out the [E-easy][eeasy] tag.
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.
171136

172-
[inom]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AI-nominated
173-
[eeasy]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy
174137
[lru]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
175138

176139
## Out-of-tree Contributions

branches/stable/Makefile.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,3 +266,8 @@ ifneq ($(strip $(findstring TAGS.emacs,$(MAKECMDGOALS)) \
266266
CFG_INFO := $(info cfg: including ctags rules)
267267
include $(CFG_SRC_DIR)mk/ctags.mk
268268
endif
269+
270+
# Find all of the .d files and include them to add information about
271+
# header file dependencies.
272+
ALL_DEP_FILES := $(ALL_OBJ_FILES:%.o=%.d)
273+
-include $(ALL_DEP_FILES)

branches/stable/RELEASES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Language
1919

2020
* Several [restrictions have been added to trait coherence][coh] in
2121
order to make it easier for upstream authors to change traits
22-
without breaking downstream code.
22+
without breaking downsteam code.
2323
* Digits of binary and octal literals are [lexed more eagerly][lex] to
2424
improve error messages and macro behavior. For example, `0b1234` is
2525
now lexed as `0b1234` instead of two tokens, `0b1` and `234`.
@@ -169,10 +169,10 @@ Version 1.0.0-alpha.2 (February 2015)
169169
* Highlights
170170

171171
* The various I/O modules were [overhauled][io-rfc] to reduce
172-
unnecessary abstractions and provide better interoperation with
172+
unncessary abstractions and provide better interoperation with
173173
the underlying platform. The old `io` module remains temporarily
174174
at `std::old_io`.
175-
* The standard library now [participates in feature gating][feat],
175+
* The standard library now [partipates in feature gating][feat],
176176
so use of unstable libraries now requires a `#![feature(...)]`
177177
attribute. The impact of this change is [described on the
178178
forum][feat-forum]. [RFC][feat-rfc].
@@ -385,7 +385,7 @@ Version 1.0.0-alpha (January 2015)
385385
syscall when available.
386386
* The 'serialize' crate has been renamed 'rustc-serialize' and
387387
moved out of the distribution to Cargo. Although it is widely
388-
used now, it is expected to be superseded in the near future.
388+
used now, it is expected to be superceded in the near future.
389389
* The `Show` formatter, typically implemented with
390390
`#[derive(Show)]` is [now requested with the `{:?}`
391391
specifier][show] and is intended for use by all types, for uses

0 commit comments

Comments
 (0)