diff options
| author | Axary <bastian_kauschke@hotmail.de> | 2018-11-11 10:41:49 +0100 |
|---|---|---|
| committer | Axary <bastian_kauschke@hotmail.de> | 2018-11-11 10:41:49 +0100 |
| commit | 50307942481ffd95e9eb616463363542bc79b14b (patch) | |
| tree | 4088a496090b024effdae0ed3beb24791225be46 /src/libstd | |
| parent | 852ff1fc7d74a7668441e0f354f8c477c95b676d (diff) | |
| parent | b76ee83254ec0398da554f25c2168d917ba60f1c (diff) | |
| download | rust-50307942481ffd95e9eb616463363542bc79b14b.tar.gz rust-50307942481ffd95e9eb616463363542bc79b14b.zip | |
Merge branch 'master' of https://github.com/rust-lang/rust
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ffi/c_str.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index dfec13cd2ec..87ffe0f15e4 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -1178,7 +1178,7 @@ impl CStr { /// /// If the contents of the `CStr` are valid UTF-8 data, this /// function will return a [`Cow`]`::`[`Borrowed`]`(`[`&str`]`)` - /// with the the corresponding [`&str`] slice. Otherwise, it will + /// with the corresponding [`&str`] slice. Otherwise, it will /// replace any invalid UTF-8 sequences with /// [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD] and return a /// [`Cow`]`::`[`Owned`]`(`[`String`]`)` with the result. diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index f27beb0b46c..0829593505d 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -495,7 +495,7 @@ mod memchr; // compiler pub mod rt; -// Pull in the the `stdsimd` crate directly into libstd. This is the same as +// Pull in the `stdsimd` crate directly into libstd. This is the same as // libcore's arch/simd modules where the source of truth here is in a different // repository, but we pull things in here manually to get it into libstd. // |
