Skip to content

Commit 3b9a4d3

Browse files
committed
---
yaml --- r: 233802 b: refs/heads/beta c: 1c44722 h: refs/heads/master v: v3
1 parent 77b1047 commit 3b9a4d3

File tree

3 files changed

+6
-24
lines changed

3 files changed

+6
-24
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: ab792abf1fcc28afbd315426213f6428da25c085
26+
refs/heads/beta: 1c447223750f415e3624dad1f742a78376be6287
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/ffi.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,11 @@ strings are not terminated with `\0`. If you need a NUL-terminated string for
496496
interoperability with C, you should use the `CString` type in the `std::ffi`
497497
module.
498498

499-
The standard library includes type aliases and function definitions for the C
500-
standard library in the `libc` module, and Rust links against `libc` and `libm`
501-
by default.
499+
The [`libc` crate on crates.io][libc] includes type aliases and function
500+
definitions for the C standard library in the `libc` module, and Rust links
501+
against `libc` and `libm` by default.
502+
503+
[libc]: https://crates.io/crates/libc
502504

503505
# The "nullable pointer optimization"
504506

branches/beta/src/libstd/macros.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,6 @@ macro_rules! panic {
6767
/// Note that stdout is frequently line-buffered by default so it may be
6868
/// necessary to use `io::stdout().flush()` to ensure the output is emitted
6969
/// immediately.
70-
///
71-
/// # Examples
72-
///
73-
/// ```
74-
/// use std::io::{self, Write};
75-
///
76-
/// print!("this ");
77-
/// print!("will ");
78-
/// print!("be ");
79-
/// print!("on ");
80-
/// print!("the ");
81-
/// print!("same ");
82-
/// print!("line ");
83-
///
84-
/// io::stdout().flush().unwrap();
85-
///
86-
/// print!("this string has a newline, why not choose println! instead?\n");
87-
///
88-
/// io::stdout().flush().unwrap();
89-
/// ```
9070
#[macro_export]
9171
#[stable(feature = "rust1", since = "1.0.0")]
9272
#[allow_internal_unstable]

0 commit comments

Comments
 (0)