Skip to content

Commit a5c8f42

Browse files
committed
---
yaml --- r: 234067 b: refs/heads/beta c: e8758e4 h: refs/heads/master i: 234065: c7c7397 234063: a51282a v: v3
1 parent 79bb517 commit a5c8f42

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: a41d4359c5c34c3b11f3b5c03c7e35698729b951
26+
refs/heads/beta: e8758e44b40e0ed6cfdf19efe96972624a90758d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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/beta/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/beta/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/beta/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)