diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-06-24 14:09:37 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-06-24 14:09:37 -0700 |
| commit | ac9481a438d2fa5000058b0f59b9cd6113f886ce (patch) | |
| tree | a1d46e6522fca450619dd600dea644ce150e3e7e /src/libstd | |
| parent | 051fbcea72a24d14527e7ba370cc80277a4ac18e (diff) | |
| parent | 9b2d9a9539d77695e915ebed189575d1249e7064 (diff) | |
| download | rust-ac9481a438d2fa5000058b0f59b9cd6113f886ce.tar.gz rust-ac9481a438d2fa5000058b0f59b9cd6113f886ce.zip | |
Merge remote-tracking branch 'reusee/master' into HEAD
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/str.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 1ceb22b20ca..de87f967d28 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -1717,5 +1717,5 @@ mod tests { assert!(!os::mkdir_recursive(&path, (S_IRUSR | S_IWUSR | S_IXUSR) as i32)); } - // More recursive_mkdir tests are in std::tempfile + // More recursive_mkdir tests are in extra::tempfile } diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 16c287c1da8..801a4af281e 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -14,7 +14,7 @@ * Strings are a packed UTF-8 representation of text, stored as null * terminated buffers of u8 bytes. Strings should be indexed in bytes, * for efficiency, but UTF-8 unsafe operations should be avoided. For - * some heavy-duty uses, try std::rope. + * some heavy-duty uses, try extra::rope. */ use at_vec; |
