Skip to content

Commit 29fbae4

Browse files
committed
---
yaml --- r: 147239 b: refs/heads/try2 c: b0bcbbb h: refs/heads/master i: 147237: 009e47a 147235: 6f245bf 147231: 66c511f v: v3
1 parent f62fa77 commit 29fbae4

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: c126aa56924ceec46557eb66420482f854145c87
8+
refs/heads/try2: b0bcbbb154f11aeb302b45e4ba0627604af181a0
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ impl<T:Freeze + Send> MutexArc<T> {
276276
* might contain nested MutexArcs inside.
277277
*
278278
* The purpose of this is to offer a safe implementation of MutexArc to be
279-
* used instead of RWArc in cases where no readers are needed and sightly
279+
* used instead of RWArc in cases where no readers are needed and slightly
280280
* better performance is required.
281281
*
282282
* Both methods have the same failure behaviour as unsafe_access and

branches/try2/src/libextra/getopts.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! file name following `-o`, and accepts both `-h` and `--help` as optional flags.
3131
//!
3232
//! ~~~{.rust}
33-
//! exter mod extra;
33+
//! extern mod extra;
3434
//! use extra::getopts::*;
3535
//! use std::os;
3636
//!
@@ -114,7 +114,7 @@ pub enum Occur {
114114
pub struct Opt {
115115
/// Name of the option
116116
name: Name,
117-
/// Wheter it has an argument
117+
/// Whether it has an argument
118118
hasarg: HasArg,
119119
/// How often it can occur
120120
occur: Occur,
@@ -154,7 +154,7 @@ pub enum Fail_ {
154154
UnexpectedArgument(~str),
155155
}
156156

157-
/// The type of failure that occured.
157+
/// The type of failure that occurred.
158158
#[deriving(Eq)]
159159
#[allow(missing_doc)]
160160
pub enum FailType {

branches/try2/src/libextra/tempfile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use std::io;
1818
use std::io::fs;
1919

2020
/// A wrapper for a path to temporary directory implementing automatic
21-
/// scope-pased deletion.
21+
/// scope-based deletion.
2222
pub struct TempDir {
2323
priv path: Option<Path>
2424
}

branches/try2/src/libextra/uuid.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ identifiers to entities without requiring a central allocating authority.
1717
1818
They are particularly useful in distributed systems, though can be used in
1919
disparate areas, such as databases and network protocols. Typically a UUID is
20-
displayed in a readable string form as a sequence of hexadecimals digits,
20+
displayed in a readable string form as a sequence of hexadecimal digits,
2121
separated into groups by hyphens.
2222
2323
The uniqueness property is not strictly guaranteed, however for all practical
@@ -89,11 +89,11 @@ pub enum UuidVersion {
8989
/// The reserved variants of UUIDs
9090
#[deriving(Eq)]
9191
pub enum UuidVariant {
92-
/// Reserved by the NCS for backward compatability
92+
/// Reserved by the NCS for backward compatibility
9393
VariantNCS,
9494
/// As described in the RFC4122 Specification (default)
9595
VariantRFC4122,
96-
/// Resreved by Microsoft for backward compatability
96+
/// Reserved by Microsoft for backward compatibility
9797
VariantMicrosoft,
9898
/// Reserved for future expansion
9999
VariantFuture,
@@ -313,7 +313,7 @@ impl Uuid {
313313
str::from_utf8_owned(s)
314314
}
315315

316-
/// Returns a string of hexadecimal digits, separated into groups with a hypen
316+
/// Returns a string of hexadecimal digits, separated into groups with a hyphen.
317317
///
318318
/// Example: `550e8400-e29b-41d4-a716-446655440000`
319319
pub fn to_hyphenated_str(&self) -> ~str {

0 commit comments

Comments
 (0)