File tree 1 file changed +6
-13
lines changed
1 file changed +6
-13
lines changed Original file line number Diff line number Diff line change @@ -121,27 +121,20 @@ pub unsafe fn borrow<T>(f: &fn(&mut T)) {
121
121
/// For the Scheduler pointer to be aliased
122
122
pub unsafe fn unsafe_borrow < T > ( ) -> * mut T {
123
123
let key = tls_key ( ) ;
124
- let mut void_ptr: * mut c_void = tls:: get ( key) ;
124
+ let void_ptr = tls:: get ( key) ;
125
125
if void_ptr. is_null ( ) {
126
126
rtabort ! ( "thread-local pointer is null. bogus!" ) ;
127
127
}
128
- let ptr: * mut * mut c_void = & mut void_ptr;
129
- let ptr: * mut ~T = ptr as * mut ~T ;
130
- let ptr: * mut T = & mut * * ptr;
131
- return ptr;
128
+ void_ptr as * mut T
132
129
}
133
130
134
131
pub unsafe fn try_unsafe_borrow < T > ( ) -> Option < * mut T > {
135
132
let key = tls_key ( ) ;
136
- let mut void_ptr: * mut c_void = tls:: get ( key) ;
133
+ let void_ptr = tls:: get ( key) ;
137
134
if void_ptr. is_null ( ) {
138
- return None ;
139
- }
140
- {
141
- let ptr: * mut * mut c_void = & mut void_ptr;
142
- let ptr: * mut ~T = ptr as * mut ~T ;
143
- let ptr: * mut T = & mut * * ptr;
144
- return Some ( ptr) ;
135
+ None
136
+ } else {
137
+ Some ( void_ptr as * mut T )
145
138
}
146
139
}
147
140
You can’t perform that action at this time.
0 commit comments