Merge branch 'master' into tyler_elastic_threadpool

Author: Stjepan Glavina

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at stjepang@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

Cargo.toml

@@ -7,25 +7,26 @@ license = "Apache-2.0/MIT"
 repository = "https://github.com/stjepang/async-std"
 homepage = "https://github.com/stjepang/async-std"
 documentation = "https://docs.rs/async-std"
-description = "Asynchronous standard library"
-keywords = []
-categories = ["asynchronous", "concurrency"]
+description = "Async version of the Rust standard library"
+keywords = ["async", "await", "future", "std", "task"]
+categories = ["asynchronous", "concurrency", "network-programming"]
 
 [package.metadata.docs.rs]
-features = ["docs.rs"]
-rustdoc-args = ["--features docs.rs"]
+features = ["docs"]
+rustdoc-args = ["--features docs"]
 
 [features]
-"docs.rs" = []
+docs = []
 
 [dependencies]
-async-task = { path = "async-task" }
+async-task = { path = "../async-task" }
 cfg-if = "0.1.9"
 crossbeam = "0.7.1"
 futures-preview = "0.3.0-alpha.17"
 futures-timer = "0.3.0"
 lazy_static = "1.3.0"
 log = { version = "0.4.8", features = ["kv_unstable"] }
+memchr = "2.2.1"
 mio = "0.6.19"
 mio-uds = "0.6.7"
 num_cpus = "1.10.0"
@@ -36,9 +37,3 @@ slab = "0.4.2"
 femme = "1.1.0"
 # surf = { git = "ssh://github.com/yoshuawuyts/surf" }
 tempdir = "0.3.7"
-
-[workspace]
-members = [
-  ".",
-  "async-task",
-]

README.md

@@ -1,4 +1,4 @@
-# Async version of Rust's standard library
+# Async version of the Rust standard library
 
 <!-- [![Build Status](https://travis-ci.org/stjepang/async-std.svg?branch=master)]( -->
 <!-- https://travis-ci.org/stjepang/async-std) -->
@@ -25,7 +25,7 @@ git clone git@github.com:stjepang/async-std.git && cd async-std
 Read the docs:
 
 ```
-cargo doc --features docs.rs --open
+cargo doc --features docs --open
 ```
 
 Check out the [examples](examples). To run an example: