---

nbaksalyar · nbaksalyar · commit e45bf98253e4 · 2016-01-31T19:01:32.000+03:00
yaml --- r: 274538 b: refs/heads/stable c: bb6e646 h: refs/heads/master
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: e5da5d59f817eb6a3b78134d49b80c3ed6cb42c9
+refs/heads/stable: bb6e646c7b7c8c97982106aafc106b18a1913c81
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e
diff --git a/branches/stable/src/libstd/sys/unix/thread.rs b/branches/stable/src/libstd/sys/unix/thread.rs
@@ -258,7 +258,7 @@ pub mod guard {
 
     #[cfg(target_os = "solaris")]
     pub unsafe fn current() -> Option<usize> {
-        let mut current_stack: libc::stack_t = mem::zeroed();
+        let mut current_stack: libc::stack_t = ::mem::zeroed();
         assert_eq!(libc::stack_getbounds(&mut current_stack), 0);
         Some(current_stack.ss_sp as usize)
     }

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ pub mod guard {`
`258`	`258`
`259`	`259`	`#[cfg(target_os = "solaris")]`
`260`	`260`	`pub unsafe fn current() -> Option<usize> {`
`261`		`- let mut current_stack: libc::stack_t = mem::zeroed();`
	`261`	`+ let mut current_stack: libc::stack_t = ::mem::zeroed();`
`262`	`262`	`assert_eq!(libc::stack_getbounds(&mut current_stack), 0);`
`263`	`263`	`Some(current_stack.ss_sp as usize)`
`264`	`264`	`}`