From ca39917d2cc309106d57153264130358c5d2b026 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sat, 31 Oct 2020 12:08:06 +0900 Subject: [PATCH 1/2] Update CoC contact information --- CODE_OF_CONDUCT.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 599b28c0..ae97b324 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,10 +34,13 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at fafhrd91@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems 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. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at robjtede@icloud.com ([@robjtede]) or huyuumi@neet.club ([@JohnTitor]). The project team will review and investigate all complaints, and will respond in a way that it deems 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. +[@robjtede]: https://github.com/robjtede +[@JohnTitor]: https://github.com/JohnTitor + ## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] From 4cc1c877242014569a5c6b9f07e15716ae46c6eb Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sat, 21 Nov 2020 02:45:57 +0400 Subject: [PATCH 2/2] docs(transform): remove extra generic parameter (#211) --- actix-service/src/transform.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actix-service/src/transform.rs b/actix-service/src/transform.rs index b6d3eb8c..0ebfc5b7 100644 --- a/actix-service/src/transform.rs +++ b/actix-service/src/transform.rs @@ -70,7 +70,7 @@ where /// timeout: Duration, /// } /// -/// impl Transform for TimeoutTransform +/// impl Transform for TimeoutTransform /// where /// S: Service, /// {