Skip to content

Commit 89d2dcf

Browse files
committed
---
yaml --- r: 228543 b: refs/heads/try c: 48a1f1b h: refs/heads/master i: 228541: ec13f9d 228539: 68c21fe 228535: d262e29 228527: 02cbe8a 228511: 7994004 228479: 104f53a v: v3
1 parent 2c2c950 commit 89d2dcf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+984
-261
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: ac33f1572bc67c028034a6c39929a500bd8ca5a9
4+
refs/heads/try: 48a1f1b96f3e80d75f50d65e8dd5672ac47cfa8c
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libcore/atomic.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ use intrinsics;
7878
use cell::UnsafeCell;
7979

8080
use default::Default;
81+
use fmt;
8182

8283
/// A boolean type which can be safely shared between threads.
8384
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1089,3 +1090,23 @@ pub fn fence(order: Ordering) {
10891090
}
10901091
}
10911092
}
1093+
1094+
macro_rules! impl_Debug {
1095+
($($t:ident)*) => ($(
1096+
#[stable(feature = "atomic_debug", since = "1.3.0")]
1097+
impl fmt::Debug for $t {
1098+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1099+
f.debug_tuple(stringify!($t)).field(&self.load(Ordering::SeqCst)).finish()
1100+
}
1101+
}
1102+
)*);
1103+
}
1104+
1105+
impl_Debug!{ AtomicUsize AtomicIsize AtomicBool }
1106+
1107+
#[stable(feature = "atomic_debug", since = "1.3.0")]
1108+
impl<T> fmt::Debug for AtomicPtr<T> {
1109+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1110+
f.debug_tuple("AtomicPtr").field(&self.load(Ordering::SeqCst)).finish()
1111+
}
1112+
}

branches/try/src/libcore/fmt/num.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
// FIXME: #6220 Implement floating point formatting
1414

15-
#![allow(unsigned_negation)]
16-
1715
use prelude::*;
1816

1917
use fmt;

branches/try/src/libcore/ops.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ pub trait Neg {
517517
macro_rules! neg_impl_core {
518518
($id:ident => $body:expr, $($t:ty)*) => ($(
519519
#[stable(feature = "rust1", since = "1.0.0")]
520-
#[allow(unsigned_negation)]
521520
impl Neg for $t {
522521
#[stable(feature = "rust1", since = "1.0.0")]
523522
type Output = $t;

branches/try/src/libcore/str/mod.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -636,10 +636,10 @@ impl<'a, P: Pattern<'a>> SplitInternal<'a, P> {
636636

637637
generate_pattern_iterators! {
638638
forward:
639-
#[doc="Created with the method `.split()`."]
639+
/// Created with the method `.split()`.
640640
struct Split;
641641
reverse:
642-
#[doc="Created with the method `.rsplit()`."]
642+
/// Created with the method `.rsplit()`.
643643
struct RSplit;
644644
stability:
645645
#[stable(feature = "rust1", since = "1.0.0")]
@@ -650,10 +650,10 @@ generate_pattern_iterators! {
650650

651651
generate_pattern_iterators! {
652652
forward:
653-
#[doc="Created with the method `.split_terminator()`."]
653+
/// Created with the method `.split_terminator()`.
654654
struct SplitTerminator;
655655
reverse:
656-
#[doc="Created with the method `.rsplit_terminator()`."]
656+
/// Created with the method `.rsplit_terminator()`.
657657
struct RSplitTerminator;
658658
stability:
659659
#[stable(feature = "rust1", since = "1.0.0")]
@@ -696,10 +696,10 @@ impl<'a, P: Pattern<'a>> SplitNInternal<'a, P> {
696696

697697
generate_pattern_iterators! {
698698
forward:
699-
#[doc="Created with the method `.splitn()`."]
699+
/// Created with the method `.splitn()`.
700700
struct SplitN;
701701
reverse:
702-
#[doc="Created with the method `.rsplitn()`."]
702+
/// Created with the method `.rsplitn()`.
703703
struct RSplitN;
704704
stability:
705705
#[stable(feature = "rust1", since = "1.0.0")]
@@ -730,10 +730,10 @@ impl<'a, P: Pattern<'a>> MatchIndicesInternal<'a, P> {
730730

731731
generate_pattern_iterators! {
732732
forward:
733-
#[doc="Created with the method `.match_indices()`."]
733+
/// Created with the method `.match_indices()`.
734734
struct MatchIndices;
735735
reverse:
736-
#[doc="Created with the method `.rmatch_indices()`."]
736+
/// Created with the method `.rmatch_indices()`.
737737
struct RMatchIndices;
738738
stability:
739739
#[unstable(feature = "str_match_indices",
@@ -771,10 +771,10 @@ impl<'a, P: Pattern<'a>> MatchesInternal<'a, P> {
771771

772772
generate_pattern_iterators! {
773773
forward:
774-
#[doc="Created with the method `.matches()`."]
774+
/// Created with the method `.matches()`.
775775
struct Matches;
776776
reverse:
777-
#[doc="Created with the method `.rmatches()`."]
777+
/// Created with the method `.rmatches()`.
778778
struct RMatches;
779779
stability:
780780
#[stable(feature = "str_matches", since = "1.2.0")]

branches/try/src/libcoretest/fmt/num.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10-
#![allow(unsigned_negation)]
11-
1210
use core::fmt::radix;
1311

1412
#[test]

0 commit comments

Comments
 (0)