Skip to content

Commit 65cd373

Browse files
committed
---
yaml --- r: 231831 b: refs/heads/auto c: e8758e4 h: refs/heads/master i: 231829: 3f1e5cc 231827: 23e7c63 231823: dfb2248 v: v3
1 parent c2e81b0 commit 65cd373

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: a41d4359c5c34c3b11f3b5c03c7e35698729b951
11+
refs/heads/auto: e8758e44b40e0ed6cfdf19efe96972624a90758d
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/doc/trpl/advanced-linking.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ formal `#[link(...)]` attribute on `extern` blocks instead.
3434

3535
# Static linking
3636

37-
Static linking refers to the process of creating output that contains all
38-
required libraries and so doesn't need libraries installed on every system where
37+
Static linking refers to the process of creating output that contain all
38+
required libraries and so don't need libraries installed on every system where
3939
you want to use your compiled project. Pure-Rust dependencies are statically
4040
linked by default so you can use created binaries and libraries without
4141
installing Rust everywhere. By contrast, native libraries

branches/auto/src/libcollections/macros.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@
3232
/// Note that unlike array expressions this syntax supports all elements
3333
/// which implement `Clone` and the number of elements doesn't have to be
3434
/// a constant.
35-
///
36-
/// This will use `clone()` to duplicate an expression, so one should be careful
37-
/// using this with types having a nonstandard `Clone` implementation. For
38-
/// example, `vec![Rc::new(1); 5]` will create a vector of five references
39-
/// to the same boxed integer value, not five references pointing to independently
40-
/// boxed integers.
4135
#[cfg(not(test))]
4236
#[macro_export]
4337
#[stable(feature = "rust1", since = "1.0.0")]

branches/auto/src/libstd/rt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fn lang_start(main: *const u8, argc: isize, argv: *const *const u8) -> isize {
119119
/// Returns `Ok` if the handler was successfully registered, meaning that the
120120
/// closure will be run once the main thread exits. Returns `Err` to indicate
121121
/// that the closure could not be registered, meaning that it is not scheduled
122-
/// to be rune.
122+
/// to be run.
123123
pub fn at_exit<F: FnOnce() + Send + 'static>(f: F) -> Result<(), ()> {
124124
if at_exit_imp::push(Box::new(f)) {Ok(())} else {Err(())}
125125
}

branches/auto/src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2236,7 +2236,8 @@ impl<'a> Parser<'a> {
22362236
self.span_err(last_span,
22372237
"structure literal must either \
22382238
have at least one field or use \
2239-
structure update syntax");
2239+
functional structure update \
2240+
syntax");
22402241
}
22412242

22422243
hi = self.span.hi;

0 commit comments

Comments
 (0)