about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-24 07:06:09 -0700
committerbors <bors@rust-lang.org>2013-09-24 07:06:09 -0700
commitb6fe27c9abc9f279e8b41b1760de694e9bdb9430 (patch)
tree554cf789da502cdc75bbf5a2ed38a28daf189ed7 /src/libstd
parent85ca934bfe4dc3fc9dc0183a95a95f2958deb374 (diff)
parent4aee7b2b428e9561018d378b3db69d61cc924cc2 (diff)
downloadrust-b6fe27c9abc9f279e8b41b1760de694e9bdb9430.tar.gz
rust-b6fe27c9abc9f279e8b41b1760de694e9bdb9430.zip
auto merge of #9462 : SimonSapin/rust/patch-3, r=huonw
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/str.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/str.rs b/src/libstd/str.rs
index db4fe5fc762..c94d8f366a6 100644
--- a/src/libstd/str.rs
+++ b/src/libstd/str.rs
@@ -78,8 +78,8 @@ assert_eq!(buf, ~"testing 123");
 
 Rust's string type, `str`, is a sequence of unicode codepoints encoded as a
 stream of UTF-8 bytes. All safely-created strings are guaranteed to be validly
-encoded UTF-8 sequences. Additionally, strings are not guaranteed to be
-null-terminated (the null byte is a valid unicode codepoint).
+encoded UTF-8 sequences. Additionally, strings are not null-terminated
+and can contain null codepoints.
 
 The actual representation of strings have direct mappings to vectors: