From 243030b1408a70f073878e5a206d46d43fc60dab Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 26 Sep 2018 07:48:43 -0700 Subject: std: Don't let `rust_panic` get inlined It's meant for breakpoints, so if it gets inlined we can't set a breakpoint on it easily! --- src/libstd/panicking.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libstd') 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) -> ! { } /// 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) -> ! { -- cgit 1.4.1-3-g733a5 From 5285d35b49e1e8976f2a8d9d2e6f5bd1324016d3 Mon Sep 17 00:00:00 2001 From: Marcus Griep Date: Fri, 28 Sep 2018 08:01:31 -0400 Subject: Improve docs for std::io::Seek Fixes #54562 --- src/libstd/io/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstd') 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. -- cgit 1.4.1-3-g733a5