diff options
| author | bors <bors@rust-lang.org> | 2018-09-29 12:35:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-29 12:35:39 +0000 |
| commit | 9653f790333d1270f36f1614e85d8a7b54193e75 (patch) | |
| tree | 854a3f96041f7734a63a7b197ccd968b3674cd9a /src/libstd | |
| parent | 7e7bc060c1564b19742fd241f40a02c9210e445c (diff) | |
| parent | def5f84fa64f4a64137dcfc4cc5e3007cc9257e6 (diff) | |
| download | rust-9653f790333d1270f36f1614e85d8a7b54193e75.tar.gz rust-9653f790333d1270f36f1614e85d8a7b54193e75.zip | |
Auto merge of #54660 - kennytm:rollup, r=kennytm
Rollup of 8 pull requests Successful merges: - #54564 (Add 1.29.1 release notes) - #54567 (Include path in stamp hash for debuginfo tests) - #54577 (rustdoc: give proc-macros their own pages) - #54590 (std: Don't let `rust_panic` get inlined) - #54598 (Remove useless lifetimes from `Pin` `impl`s.) - #54604 (Added help message for `self_in_typedefs` feature gate) - #54635 (Improve docs for std::io::Seek) - #54645 (Compute Android gdb version in compiletest)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/panicking.rs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 278ee7951b3..e263db24fc2 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1204,8 +1204,8 @@ pub trait Write { pub trait Seek { /// Seek to an offset, in bytes, in a stream. /// - /// A seek beyond the end of a stream is allowed, but implementation - /// defined. + /// A seek beyond the end of a stream is allowed, but behavior is defined + /// by the implementation. /// /// If the seek operation completed successfully, /// this method returns the new position from the start of the stream. diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 6eb2db8e63b..f79c986cc89 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -517,6 +517,7 @@ pub fn update_count_then_panic(msg: Box<dyn Any + Send>) -> ! { } /// A private no-mangle function on which to slap yer breakpoints. +#[inline(never)] #[no_mangle] #[allow(private_no_mangle_fns)] // yes we get it, but we like breakpoints pub fn rust_panic(mut msg: &mut dyn BoxMeUp) -> ! { |