Skip to content

Commit 298dbca

Browse files
committed
---
yaml --- r: 207811 b: refs/heads/snap-stage3 c: 8073af7 h: refs/heads/master i: 207809: 257a62a 207807: 3d120a1 v: v3
1 parent eb8012e commit 298dbca

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
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: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: cd5abe76359d67283dbfd8067a475d3d2c249312
4+
refs/heads/snap-stage3: 8073af7399ba9dc77a08ead848fef71d9f1ba1b9
55
refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libcoretest/result.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
pub fn op1() -> Result<isize, &'static str> { Ok(666) }
12-
pub fn op2() -> Result<isize, &'static str> { Err("sadface") }
11+
fn op1() -> Result<isize, &'static str> { Ok(666) }
12+
fn op2() -> Result<isize, &'static str> { Err("sadface") }
1313

1414
#[test]
15-
pub fn test_and() {
15+
fn test_and() {
1616
assert_eq!(op1().and(Ok(667)).unwrap(), 667);
1717
assert_eq!(op1().and(Err::<i32, &'static str>("bad")).unwrap_err(),
1818
"bad");
@@ -23,7 +23,7 @@ pub fn test_and() {
2323
}
2424

2525
#[test]
26-
pub fn test_and_then() {
26+
fn test_and_then() {
2727
assert_eq!(op1().and_then(|i| Ok::<isize, &'static str>(i + 1)).unwrap(), 667);
2828
assert_eq!(op1().and_then(|_| Err::<isize, &'static str>("bad")).unwrap_err(),
2929
"bad");
@@ -35,7 +35,7 @@ pub fn test_and_then() {
3535
}
3636

3737
#[test]
38-
pub fn test_or() {
38+
fn test_or() {
3939
assert_eq!(op1().or(Ok::<_, &'static str>(667)).unwrap(), 666);
4040
assert_eq!(op1().or(Err("bad")).unwrap(), 666);
4141

@@ -44,7 +44,7 @@ pub fn test_or() {
4444
}
4545

4646
#[test]
47-
pub fn test_or_else() {
47+
fn test_or_else() {
4848
assert_eq!(op1().or_else(|_| Ok::<isize, &'static str>(667)).unwrap(), 666);
4949
assert_eq!(op1().or_else(|e| Err::<isize, &'static str>(e)).unwrap(), 666);
5050

@@ -54,13 +54,13 @@ pub fn test_or_else() {
5454
}
5555

5656
#[test]
57-
pub fn test_impl_map() {
57+
fn test_impl_map() {
5858
assert!(Ok::<isize, isize>(1).map(|x| x + 1) == Ok(2));
5959
assert!(Err::<isize, isize>(1).map(|x| x + 1) == Err(1));
6060
}
6161

6262
#[test]
63-
pub fn test_impl_map_err() {
63+
fn test_impl_map_err() {
6464
assert!(Ok::<isize, isize>(1).map_err(|x| x + 1) == Ok(1));
6565
assert!(Err::<isize, isize>(1).map_err(|x| x + 1) == Err(2));
6666
}
@@ -89,7 +89,7 @@ fn test_collect() {
8989
*/
9090

9191
#[test]
92-
pub fn test_fmt_default() {
92+
fn test_fmt_default() {
9393
let ok: Result<isize, &'static str> = Ok(100);
9494
let err: Result<isize, &'static str> = Err("Err");
9595

@@ -100,7 +100,7 @@ pub fn test_fmt_default() {
100100
}
101101

102102
#[test]
103-
pub fn test_unwrap_or() {
103+
fn test_unwrap_or() {
104104
let ok: Result<isize, &'static str> = Ok(100);
105105
let ok_err: Result<isize, &'static str> = Err("Err");
106106

@@ -109,7 +109,7 @@ pub fn test_unwrap_or() {
109109
}
110110

111111
#[test]
112-
pub fn test_unwrap_or_else() {
112+
fn test_unwrap_or_else() {
113113
fn handler(msg: &'static str) -> isize {
114114
if msg == "I got this." {
115115
50

0 commit comments

Comments
 (0)