You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
1.7 KiB
54 lines
1.7 KiB
7 years ago
|
From 02c2c5953c1ab19db697cc6916f38d93d2550116 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stjepan Glavina <stjepang@gmail.com>
|
||
|
|
Date: Fri, 16 Feb 2018 11:51:46 +0100
|
||
|
|
Subject: [PATCH] Fix failing doctests on i686 (#64)
|
||
|
|
|
||
|
|
---
|
||
|
|
src/atomic.rs | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/atomic.rs b/src/atomic.rs
|
||
|
|
index 0677332..d5e9bd6 100644
|
||
|
|
--- a/src/atomic.rs
|
||
|
|
+++ b/src/atomic.rs
|
||
|
|
@@ -681,8 +681,8 @@ impl<T> Owned<T> {
|
||
|
|
///
|
||
|
|
/// let o = Owned::new(0u64);
|
||
|
|
/// assert_eq!(o.tag(), 0);
|
||
|
|
- /// let o = o.with_tag(5);
|
||
|
|
- /// assert_eq!(o.tag(), 5);
|
||
|
|
+ /// let o = o.with_tag(2);
|
||
|
|
+ /// assert_eq!(o.tag(), 2);
|
||
|
|
/// ```
|
||
|
|
pub fn with_tag(self, tag: usize) -> Owned<T> {
|
||
|
|
let data = self.into_data();
|
||
|
|
@@ -985,10 +985,10 @@ impl<'g, T> Shared<'g, T> {
|
||
|
|
/// use crossbeam_epoch::{self as epoch, Atomic, Owned};
|
||
|
|
/// use std::sync::atomic::Ordering::SeqCst;
|
||
|
|
///
|
||
|
|
- /// let a = Atomic::<u64>::from(Owned::new(0u64).with_tag(5));
|
||
|
|
+ /// let a = Atomic::<u64>::from(Owned::new(0u64).with_tag(2));
|
||
|
|
/// let guard = &epoch::pin();
|
||
|
|
/// let p = a.load(SeqCst, guard);
|
||
|
|
- /// assert_eq!(p.tag(), 5);
|
||
|
|
+ /// assert_eq!(p.tag(), 2);
|
||
|
|
/// ```
|
||
|
|
pub fn tag(&self) -> usize {
|
||
|
|
let (_, tag) = decompose_data::<T>(self.data);
|
||
|
|
@@ -1007,10 +1007,10 @@ impl<'g, T> Shared<'g, T> {
|
||
|
|
/// let a = Atomic::new(0u64);
|
||
|
|
/// let guard = &epoch::pin();
|
||
|
|
/// let p1 = a.load(SeqCst, guard);
|
||
|
|
- /// let p2 = p1.with_tag(5);
|
||
|
|
+ /// let p2 = p1.with_tag(2);
|
||
|
|
///
|
||
|
|
/// assert_eq!(p1.tag(), 0);
|
||
|
|
- /// assert_eq!(p2.tag(), 5);
|
||
|
|
+ /// assert_eq!(p2.tag(), 2);
|
||
|
|
/// assert_eq!(p1.as_raw(), p2.as_raw());
|
||
|
|
/// ```
|
||
|
|
pub fn with_tag(&self, tag: usize) -> Shared<'g, T> {
|
||
|
|
--
|
||
|
|
2.16.1
|
||
|
|
|