From 0cac79181b1014bee376d9664f7bbf18559f474d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Wed, 20 May 2015 13:54:14 +0200 Subject: [PATCH 1/4] use posix command to extract first 8 chars the "-c" option of head isn't a posix option, and it isn't supported under openbsd. prefer the use of cut -c 1-8 (which is posix) to extract the first 8 chars. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4f3375b866817..9b8207ee91555 100755 --- a/configure +++ b/configure @@ -717,10 +717,10 @@ probe CFG_MD5 md5 probe CFG_MD5SUM md5sum if [ -n "$CFG_MD5" ] then - CFG_HASH_COMMAND="$CFG_MD5 -q | head -c 8" + CFG_HASH_COMMAND="$CFG_MD5 -q | cut -c 1-8" elif [ -n "$CFG_MD5SUM" ] then - CFG_HASH_COMMAND="$CFG_MD5SUM | head -c 8" + CFG_HASH_COMMAND="$CFG_MD5SUM | cut -c 1-8" else err 'could not find one of: md5 md5sum' fi From b55f0497db7350e0033b626b317e53cf95b9a8b4 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Wed, 20 May 2015 23:09:49 +0200 Subject: [PATCH 2/4] doc: that did not render well, so make it fit in one line --- src/libcore/marker.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 5909c5cc30e51..86e91df38ab35 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -120,11 +120,10 @@ pub trait Unsize { /// ``` /// /// The `PointList` `struct` cannot implement `Copy`, because `Vec` is not `Copy`. If we -/// attempt to derive a `Copy` implementation, we'll get an error. +/// attempt to derive a `Copy` implementation, we'll get an error: /// /// ```text -/// error: the trait `Copy` may not be implemented for this type; field `points` does not implement -/// `Copy` +/// the trait `Copy` may not be implemented for this type; field `points` does not implement `Copy` /// ``` /// /// ## How can I implement `Copy`? From 74fadfaeeaa31ec8ef92622c009131990dd9a936 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 20 May 2015 17:19:57 -0400 Subject: [PATCH 3/4] Change "must" to "may only" in macro future proofing rules. They don't have to be followed by anything. --- src/doc/trpl/macros.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/doc/trpl/macros.md b/src/doc/trpl/macros.md index cc7d9b595f910..a45d4824f4123 100644 --- a/src/doc/trpl/macros.md +++ b/src/doc/trpl/macros.md @@ -476,9 +476,9 @@ which syntactic form it matches. There are additional rules regarding the next token after a metavariable: -* `expr` variables must be followed by one of: `=> , ;` -* `ty` and `path` variables must be followed by one of: `=> , : = > as` -* `pat` variables must be followed by one of: `=> , =` +* `expr` variables may only be followed by one of: `=> , ;` +* `ty` and `path` variables may only be followed by one of: `=> , : = > as` +* `pat` variables may only be followed by one of: `=> , =` * Other variables may be followed by any token. These rules provide some flexibility for Rust’s syntax to evolve without From c5c508621db6c0239511a46f69d7c850347ab025 Mon Sep 17 00:00:00 2001 From: OlegTsyba Date: Thu, 21 May 2015 01:40:23 +0300 Subject: [PATCH 4/4] Fix the typo in The Rust Programming Language book, 5.18. Strings --- src/doc/trpl/strings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/trpl/strings.md b/src/doc/trpl/strings.md index abe17a96b39a6..c354fd09edd80 100644 --- a/src/doc/trpl/strings.md +++ b/src/doc/trpl/strings.md @@ -123,7 +123,7 @@ let world = "world!".to_string(); let hello_world = hello + &world; ``` -This is because `&String` can automatically coerece to a `&str`. This is a +This is because `&String` can automatically coerce to a `&str`. This is a feature called ‘[`Deref` coercions][dc]’. [dc]: deref-coercions.html