Skip to content

Commit 8153cfa

Browse files
authored
Merge pull request #1359 from jtescher/fix-typos
Fix small typos
2 parents 988b870 + 5700ad7 commit 8153cfa

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@
636636

637637
#### Bug Fixes
638638

639-
* **cargo:** remove * dependendies for serde and env_logger ([4a05bee9](https://github.com/hyperium/hyper/commit/4a05bee9abdc426bbd904fe356b771e492dc8f43))
639+
* **cargo:** remove * dependencies for serde and env_logger ([4a05bee9](https://github.com/hyperium/hyper/commit/4a05bee9abdc426bbd904fe356b771e492dc8f43))
640640
* **server:**
641641
* Flush 100-continue messages ([92ff50f2](https://github.com/hyperium/hyper/commit/92ff50f2e57fa2cb8a55b3d6d9fa43ef9a1b5526), closes [#704](https://github.com/hyperium/hyper/issues/704))
642642
* Removed check for GET/HEAD request when parsing body ([0b05c590](https://github.com/hyperium/hyper/commit/0b05c5903e86327cc9cb4cac39217e496851fce3), closes [#698](https://github.com/hyperium/hyper/issues/698))
@@ -682,7 +682,7 @@
682682
#### Features
683683

684684
* **headers:** Add Access-Control-Expose-Headers ([f783e991](https://github.com/hyperium/hyper/commit/f783e9913b988f3d5c28707e2291145999756dbe))
685-
* **server:** Add hooks for HttpListener and HttpsListener to be started from existing listene ([fa0848d4](https://github.com/hyperium/hyper/commit/fa0848d4216aa81e7b7619b7ce0a650356ee7ab7))
685+
* **server:** Add hooks for HttpListener and HttpsListener to be started from existing listener ([fa0848d4](https://github.com/hyperium/hyper/commit/fa0848d4216aa81e7b7619b7ce0a650356ee7ab7))
686686

687687

688688
#### Breaking Changes
@@ -750,7 +750,7 @@
750750

751751
#### Bug Fixes
752752

753-
* **client:** fix panics when some errors occured inside HttpMessage ([ef15257b](https://github.com/hyperium/hyper/commit/ef15257b733d40bc3a7c598f61918f91385585f9))
753+
* **client:** fix panics when some errors occurred inside HttpMessage ([ef15257b](https://github.com/hyperium/hyper/commit/ef15257b733d40bc3a7c598f61918f91385585f9))
754754
* **headers:** case insensitive values for Connection header ([341f8eae](https://github.com/hyperium/hyper/commit/341f8eae6eb33e2242be09541807cdad9afc732e), closes [#635](https://github.com/hyperium/hyper/issues/635))
755755

756756

@@ -1002,7 +1002,7 @@ types changed.
10021002
#### Bug Fixes
10031003

10041004
* **client:**
1005-
* dont call close() inside Request ([3334fca2](https://github.com/hyperium/hyper/commit/3334fca278e662b2755e41045ce641238514bea9), closes [#519](https://github.com/hyperium/hyper/issues/519))
1005+
* don't call close() inside Request ([3334fca2](https://github.com/hyperium/hyper/commit/3334fca278e662b2755e41045ce641238514bea9), closes [#519](https://github.com/hyperium/hyper/issues/519))
10061006
* keep the underlying connector when setting an SSL verifier ([f4556d55](https://github.com/hyperium/hyper/commit/f4556d554faa2a1170fec0af5b4076c31e7c3600), closes [#495](https://github.com/hyperium/hyper/issues/495))
10071007
* **mock:** adjust ChannelMockConnector connect method to compile ([085d7b07](https://github.com/hyperium/hyper/commit/085d7b0752d7fc0134e99e9eec2a67cc66b319b3))
10081008

@@ -1030,7 +1030,7 @@ types changed.
10301030

10311031
([62d96adc](https://github.com/hyperium/hyper/commit/62d96adc6b852b3836b47fc2e154bbdbab9ad7f6))
10321032
* Any custom Connectors will need to change to &self in
1033-
the connect method. Any Connectors that needed the mutablity need to
1033+
the connect method. Any Connectors that needed the mutability need to
10341034
figure out a synchronization strategy.
10351035

10361036
Request::with_connector() takes a &NetworkConnector instead of &mut.

src/header/common/link.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ fn verify_and_trim(s: &str, b: (u8, u8)) -> ::Result<&str> {
870870
let byte_array = s.as_bytes();
871871

872872
// Verify that `s` starts with `b.0` and ends with `b.1` and return
873-
// the contained substring after triming whitespace.
873+
// the contained substring after trimming whitespace.
874874
if length > 1 && b.0 == byte_array[0] && b.1 == byte_array[length - 1] {
875875
Ok(s.trim_matches(
876876
|c: char| c == b.0 as char || c == b.1 as char || c.is_whitespace())

src/proto/h1/parse.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl Http1Transaction for ServerTransaction {
9090
// https://tools.ietf.org/html/rfc7230#section-3.3.3
9191
// If Transfer-Encoding header is present, and 'chunked' is
9292
// not the final encoding, and this is a Request, then it is
93-
// mal-formed. A server should responsed with 400 Bad Request.
93+
// mal-formed. A server should respond with 400 Bad Request.
9494
if encodings.last() == Some(&header::Encoding::Chunked) {
9595
Ok(Decoder::chunked())
9696
} else {
@@ -137,7 +137,7 @@ impl Http1Transaction for ServerTransaction {
137137
impl ServerTransaction {
138138
fn set_length(head: &mut MessageHead<StatusCode>, has_body: bool, method: Option<&Method>) -> Encoder {
139139
// these are here thanks to borrowck
140-
// `if method == Some(&Method::Get)` says the RHS doesnt live long enough
140+
// `if method == Some(&Method::Get)` says the RHS doesn't live long enough
141141
const HEAD: Option<&'static Method> = Some(&Method::Head);
142142
const CONNECT: Option<&'static Method> = Some(&Method::Connect);
143143

tests/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ macro_rules! test {
8080
while n < buf.len() && n < expected.len() {
8181
n += match inc.read(&mut buf[n..]) {
8282
Ok(n) => n,
83-
Err(e) => panic!("failed to read request, partialy read = {:?}, error: {}", s(&buf[..n]), e),
83+
Err(e) => panic!("failed to read request, partially read = {:?}, error: {}", s(&buf[..n]), e),
8484
};
8585
}
8686
assert_eq!(s(&buf[..n]), expected);

0 commit comments

Comments
 (0)