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 12 pull requests #65382

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
dfe76a1
Split non-CAS atomic support off into target_has_atomic_load_store
Amanieu Oct 8, 2019
6afc509
vxWorks: implement get_path() and get_mode() for File fmt::Debug
BaoshanPang Oct 9, 2019
e8af4c1
resolve: Mark macros starting with an underscore as used
petrochenkov Oct 9, 2019
1270140
expand: Simplify expansion of derives
petrochenkov Oct 9, 2019
57aae75
improve performance of signed saturating_mul
tspiteri Oct 11, 2019
e5daab8
Fix typo
Oct 12, 2019
9a0b9c6
remove old branch of unwind logic
RalfJung Oct 12, 2019
a1a8f33
update test for nounwind on FFI imports
RalfJung Oct 12, 2019
63af27f
also (properly) test nounwind on function definitions
RalfJung Oct 12, 2019
79c623f
some typography
RalfJung Oct 12, 2019
a010652
fix #[unwind(abort)] for Rust ABIs
RalfJung Oct 12, 2019
df93351
test unwind(abort) with Rust ABI
RalfJung Oct 12, 2019
09d7be3
make tests more robust
RalfJung Oct 12, 2019
cd0e4c3
Implement Error::source on IntoStringError
faern Oct 13, 2019
d488500
Don't discard value names when using address or memory sanitizer
tmiasko Oct 13, 2019
37018e0
Fix typos in error.rs
Oct 13, 2019
b8e7f76
Remove Error::cause impls equal to deafult impl
faern Oct 13, 2019
cfda050
Add `dyn` to `Any` documentation
Cerber-Ursi Oct 13, 2019
0510bbf
Added code element
Cerber-Ursi Oct 13, 2019
4a0c487
syntax: consolidate function parsing in `item.rs`
Centril Oct 11, 2019
e67fa77
Fix typo in docs for `Rc`
kalabukdima Oct 13, 2019
82add0f
Rollup merge of #65214 - Amanieu:cfg_atomic, r=alexcrichton
Centril Oct 13, 2019
e56ba54
Rollup merge of #65246 - Wind-River:real_master_2, r=kennytm
Centril Oct 13, 2019
f22a784
Rollup merge of #65252 - petrochenkov:deriveholders2, r=matthewjasper
Centril Oct 13, 2019
ddad134
Rollup merge of #65312 - tspiteri:signed-sat-mul, r=dtolnay
Centril Oct 13, 2019
1a2835b
Rollup merge of #65336 - BO41:typo, r=petrochenkov
Centril Oct 13, 2019
a53028e
Rollup merge of #65346 - RalfJung:nounwind-tests, r=nagisa
Centril Oct 13, 2019
24d57be
Rollup merge of #65347 - RalfJung:unwind-abort-rust, r=varkor
Centril Oct 13, 2019
fad7ed0
Rollup merge of #65362 - Centril:extract_fun, r=petrochenkov
Centril Oct 13, 2019
a927c83
Rollup merge of #65366 - faern:source-on-intostringerror, r=bluss
Centril Oct 13, 2019
45a6cc0
Rollup merge of #65369 - tmiasko:sanitizers-keep-names, r=varkor
Centril Oct 13, 2019
dd2c0db
Rollup merge of #65370 - Cerberuser:patch-1, r=jonas-schievink
Centril Oct 13, 2019
813d4c3
Rollup merge of #65373 - kalabukdima:patch-1, r=jonas-schievink
Centril Oct 13, 2019
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
2 changes: 1 addition & 1 deletion src/liballoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ mod boxed {
#[cfg(test)]
mod tests;
pub mod collections;
#[cfg(all(target_has_atomic = "ptr", target_has_atomic = "cas"))]
#[cfg(target_has_atomic = "ptr")]
pub mod sync;
pub mod rc;
pub mod raw_vec;
Expand Down
4 changes: 2 additions & 2 deletions src/liballoc/rc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ impl<T: Clone> Rc<T> {
/// referred to as clone-on-write.
///
/// If there are no other `Rc` pointers to this value, then [`Weak`]
/// pointers to this value will be dissassociated.
/// pointers to this value will be disassociated.
///
/// See also [`get_mut`], which will fail rather than cloning.
///
Expand All @@ -799,7 +799,7 @@ impl<T: Clone> Rc<T> {
/// assert_eq!(*other_data, 12);
/// ```
///
/// [`Weak`] pointers will be dissassociated:
/// [`Weak`] pointers will be disassociated:
///
/// ```
/// use std::rc::Rc;
Expand Down
10 changes: 5 additions & 5 deletions src/libcore/any.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
//! of any `'static` type through runtime reflection.
//!
//! `Any` itself can be used to get a `TypeId`, and has more features when used
//! as a trait object. As `&Any` (a borrowed trait object), it has the `is` and
//! `downcast_ref` methods, to test if the contained value is of a given type,
//! and to get a reference to the inner value as a type. As `&mut Any`, there
//! as a trait object. As `&dyn Any` (a borrowed trait object), it has the `is`
//! and `downcast_ref` methods, to test if the contained value is of a given type,
//! and to get a reference to the inner value as a type. As `&mut dyn Any`, there
//! is also the `downcast_mut` method, for getting a mutable reference to the
//! inner value. `Box<Any>` adds the `downcast` method, which attempts to
//! inner value. `Box<dyn Any>` adds the `downcast` method, which attempts to
//! convert to a `Box<T>`. See the [`Box`] documentation for the full details.
//!
//! Note that &Any is limited to testing whether a value is of a specified
//! Note that `&dyn Any` is limited to testing whether a value is of a specified
//! concrete type, and cannot be used to test whether a type implements a trait.
//!
//! [`Box`]: ../../std/boxed/struct.Box.html
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/num/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ $EndFeature, "
#[inline]
pub fn saturating_mul(self, rhs: Self) -> Self {
self.checked_mul(rhs).unwrap_or_else(|| {
if (self < 0 && rhs < 0) || (self > 0 && rhs > 0) {
if (self < 0) == (rhs < 0) {
Self::max_value()
} else {
Self::min_value()
Expand Down
Loading