Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 10 pull requests #47276

Merged
merged 23 commits into from
Jan 9, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3cfea33
wherein careful doc-decoration arithmetic proves quite the ICE-breaker
zackmdavis Jan 5, 2018
fd37526
Make wasm obey backtrace feature, like other targets
aidanhs Jan 7, 2018
92189bc
Remove redundant -Zdebug-llvm option
dotdash Jan 5, 2018
4be1d5c
Remove dead function LLVMRustLinkInParsedExternalBitcode()
dotdash Jan 5, 2018
ebc8507
Remove dead function rustc_llvm::debug_loc_to_string()
dotdash Jan 5, 2018
907855f
Remove unused LLVMRustJITMemoryManagerRef typedef
dotdash Jan 6, 2018
9e4a692
Replace empty array hack with repr(align)
Jan 7, 2018
1df384d
Rename ReprExtern to ReprC, and similarily rename a few other fields …
Jan 7, 2018
1fc6ad5
Add HashMap::remove_entry
sfackler Jan 7, 2018
cf3fefe
rustc::ty: Rename `struct_variant` to `non_enum_variant`
Jan 7, 2018
8302044
rustdoc: Don't import macros from private imports
ollie27 Jan 8, 2018
1a7b00d
Don't look for niches inside generator types. Fixes #47253
Zoxc Jan 8, 2018
9396973
Add missing links
GuillaumeGomez Jan 8, 2018
4a6f440
Rollup merge of #47210 - zackmdavis:the_3rd_of_2_hardest_problems_in_…
kennytm Jan 8, 2018
1cbbbc0
Rollup merge of #47233 - dotdash:cleanup_llvm, r=alexcrichton
kennytm Jan 8, 2018
9214e9b
Rollup merge of #47246 - aidanhs:aphs-wasm-backtrace-feature, r=KodrAus
kennytm Jan 8, 2018
4c0823a
Rollup merge of #47254 - rkruppe:no-more-align-hack, r=alexcrichton
kennytm Jan 8, 2018
d72a509
Rollup merge of #47256 - rkruppe:misc-cleanup, r=eddyb
kennytm Jan 8, 2018
6648dcd
Rollup merge of #47258 - rkruppe:struct-assert, r=eddyb
kennytm Jan 8, 2018
5ffaf4c
Rollup merge of #47259 - sfackler:map-remove-entry, r=dtolnay
kennytm Jan 8, 2018
de4e1a9
Rollup merge of #47263 - ollie27:rustdoc_private_macro_import, r=Guil…
kennytm Jan 8, 2018
9dd7cae
Rollup merge of #47270 - Zoxc:gen-layout-fix, r=eddyb
kennytm Jan 8, 2018
9ef9854
Rollup merge of #47272 - GuillaumeGomez:missing-links, r=QuietMisdreavus
kennytm Jan 8, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/libcore/fmt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,12 @@ pub type Result = result::Result<(), Error>;
/// some other means.
///
/// An important thing to remember is that the type `fmt::Error` should not be
/// confused with `std::io::Error` or `std::error::Error`, which you may also
/// confused with [`std::io::Error`] or [`std::error::Error`], which you may also
/// have in scope.
///
/// [`std::io::Error`]: ../../std/io/struct.Error.html
/// [`std::error::Error`]: ../../std/error/trait.Error.html
///
/// # Examples
///
/// ```rust
Expand Down
21 changes: 14 additions & 7 deletions src/libstd/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -997,9 +997,9 @@ pub trait Write {
///
/// Calls to `write` are not guaranteed to block waiting for data to be
/// written, and a write which would otherwise block can be indicated through
/// an `Err` variant.
/// an [`Err`] variant.
///
/// If the return value is `Ok(n)` then it must be guaranteed that
/// If the return value is [`Ok(n)`] then it must be guaranteed that
/// `0 <= n <= buf.len()`. A return value of `0` typically means that the
/// underlying object is no longer able to accept bytes and will likely not
/// be able to in the future as well, or that the buffer provided is empty.
Expand All @@ -1013,9 +1013,13 @@ pub trait Write {
/// It is **not** considered an error if the entire buffer could not be
/// written to this writer.
///
/// An error of the `ErrorKind::Interrupted` kind is non-fatal and the
/// An error of the [`ErrorKind::Interrupted`] kind is non-fatal and the
/// write operation should be retried if there is nothing else to do.
///
/// [`Err`]: ../../std/result/enum.Result.html#variant.Err
/// [`Ok(n)`]: ../../std/result/enum.Result.html#variant.Ok
/// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
///
/// # Examples
///
/// ```
Expand Down Expand Up @@ -1061,17 +1065,20 @@ pub trait Write {

/// Attempts to write an entire buffer into this write.
///
/// This method will continuously call `write` until there is no more data
/// to be written or an error of non-`ErrorKind::Interrupted` kind is
/// This method will continuously call [`write`] until there is no more data
/// to be written or an error of non-[`ErrorKind::Interrupted`] kind is
/// returned. This method will not return until the entire buffer has been
/// successfully written or such an error occurs. The first error that is
/// not of `ErrorKind::Interrupted` kind generated from this method will be
/// not of [`ErrorKind::Interrupted`] kind generated from this method will be
/// returned.
///
/// # Errors
///
/// This function will return the first error of
/// non-`ErrorKind::Interrupted` kind that `write` returns.
/// non-[`ErrorKind::Interrupted`] kind that [`write`] returns.
///
/// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
/// [`write`]: #tymethod.write
///
/// # Examples
///
Expand Down