Skip to content

Commit 9d39a68

Browse files
Revert to rust-lang#64470
1 parent 23f890f commit 9d39a68

File tree

2,032 files changed

+27656
-36900
lines changed

Some content is hidden

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

2,032 files changed

+27656
-36900
lines changed

.gitignore

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# This file should only ignore things that are generated during a `x.py` build,
2-
# generated by common IDEs, and optional files controlled by the user that
3-
# affect the build (such as config.toml).
4-
# In particular, things like `mir_dump` should not be listed here; they are only
5-
# created during manual debugging and many people like to clean up instead of
6-
# having git ignore such leftovers. You can use `.git/info/exclude` to
7-
# configure your local ignore list.
1+
# This file should only ignore things that are generated during a build,
2+
# generated by common IDEs, and optional files controlled by the user
3+
# that affect the build (such as config.toml).
84
# FIXME: This needs cleanup.
95
*~
106
.#*
@@ -56,4 +52,3 @@ config.stamp
5652
Session.vim
5753
.cargo
5854
no_llvm_build
59-
# Before adding new lines, see the comment at the top.

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
[submodule "src/doc/rust-by-example"]
2929
path = src/doc/rust-by-example
3030
url = https://github.com/rust-lang/rust-by-example.git
31+
[submodule "src/llvm-emscripten"]
32+
path = src/llvm-emscripten
33+
url = https://github.com/rust-lang/llvm.git
3134
[submodule "src/stdarch"]
3235
path = src/stdarch
3336
url = https://github.com/rust-lang/stdarch.git

CODE_OF_CONDUCT.md

+38-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
11
# The Rust Code of Conduct
22

3-
The Code of Conduct for this repository [can be found online](https://www.rust-lang.org/conduct.html).
3+
A version of this document [can be found online](https://www.rust-lang.org/conduct.html).
4+
5+
## Conduct
6+
7+
**Contact**: [[email protected]](mailto:[email protected])
8+
9+
* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
10+
* On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
11+
* Please be kind and courteous. There's no need to be mean or rude.
12+
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
13+
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
14+
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the <a href="http://citizencodeofconduct.org/">Citizen Code of Conduct</a>; if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
15+
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Rust moderation team][mod_team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
16+
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
17+
18+
## Moderation
19+
20+
21+
These are the policies for upholding our community's standards of conduct. If you feel that a thread needs moderation, please contact the [Rust moderation team][mod_team].
22+
23+
1. Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
24+
2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
25+
3. Moderators will first respond to such remarks with a warning.
26+
4. If the warning is unheeded, the user will be "kicked," i.e., kicked out of the communication channel to cool off.
27+
5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
28+
6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
29+
7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, **in private**. Complaints about bans in-channel are not allowed.
30+
8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.
31+
32+
In the Rust community we strive to go the extra step to look out for each other. Don't just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they're off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.
33+
34+
And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could've communicated better — remember that it's your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.
35+
36+
The enforcement policies listed above apply to all official Rust venues; including official IRC channels (#rust, #rust-internals, #rust-tools, #rust-libs, #rustc, #rust-beginners, #rust-docs, #rust-community, #rust-lang, and #cargo); GitHub repositories under rust-lang, rust-lang-nursery, and rust-lang-deprecated; and all forums under rust-lang.org (users.rust-lang.org, internals.rust-lang.org). For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion.
37+
38+
*Adapted from the [Node.js Policy on Trolling](https://blog.izs.me/2012/08/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
39+
40+
[mod_team]: https://www.rust-lang.org/team.html#Moderation-team

CONTRIBUTING.md

+4-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ links to the major sections:
1515
* [Helpful Links and Information](#helpful-links-and-information)
1616

1717
If you have questions, please make a post on [internals.rust-lang.org][internals] or
18-
hop on the [Rust Discord server][rust-discord] or [Rust Zulip server][rust-zulip].
18+
hop on the [Rust Discord server][rust-discord], [Rust Zulip server][rust-zulip] or [#rust-internals][pound-rust-internals].
1919

2020
As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
2121

@@ -25,6 +25,7 @@ to contribute to it in more detail than this document.
2525
If this is your first time contributing, the [walkthrough] chapter of the guide
2626
can give you a good example of how a typical contribution would go.
2727

28+
[pound-rust-internals]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
2829
[internals]: https://internals.rust-lang.org
2930
[rust-discord]: http://discord.gg/rust-lang
3031
[rust-zulip]: https://rust-lang.zulipchat.com
@@ -128,14 +129,6 @@ the master branch to your feature branch.
128129
Also, please make sure that fixup commits are squashed into other related
129130
commits with meaningful commit messages.
130131

131-
GitHub allows [closing issues using keywords][closing-keywords]. This feature
132-
should be used to keep the issue tracker tidy. However, it is generally preferred
133-
to put the "closes #123" text in the PR description rather than the issue commit;
134-
particularly during rebasing, citing the issue number in the commit can "spam"
135-
the issue in question.
136-
137-
[closing-keywords]: https://help.github.com/en/articles/closing-issues-using-keywords
138-
139132
Please make sure your pull request is in compliance with Rust's style
140133
guidelines by running
141134

@@ -411,7 +404,7 @@ If you're looking for somewhere to start, check out the [E-easy][eeasy] tag.
411404
There are a number of other ways to contribute to Rust that don't deal with
412405
this repository.
413406

414-
Answer questions in the _Get Help!_ channels from the [Rust Discord server][rust-discord], on [users.rust-lang.org][users],
407+
Answer questions in [#rust][pound-rust], or on [users.rust-lang.org][users],
415408
or on [StackOverflow][so].
416409

417410
Participate in the [RFC process](https://github.com/rust-lang/rfcs).
@@ -420,7 +413,7 @@ Find a [requested community library][community-library], build it, and publish
420413
it to [Crates.io](http://crates.io). Easier said than done, but very, very
421414
valuable!
422415

423-
[rust-discord]: https://discord.gg/rust-lang
416+
[pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
424417
[users]: https://users.rust-lang.org/
425418
[so]: http://stackoverflow.com/questions/tagged/rust
426419
[community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library

0 commit comments

Comments
 (0)