5
5
use crate :: jsapi:: glue:: JS_ForOfIteratorInit ;
6
6
use crate :: jsapi:: glue:: JS_ForOfIteratorNext ;
7
7
use crate :: jsapi:: jsid;
8
+ use crate :: jsapi:: mozilla;
8
9
use crate :: jsapi:: JSAutoRealm ;
9
10
use crate :: jsapi:: JSContext ;
10
11
use crate :: jsapi:: JSErrNum ;
@@ -22,7 +23,7 @@ use crate::jsgc::RootKind;
22
23
use crate :: jsid:: VoidId ;
23
24
use crate :: jsval:: UndefinedValue ;
24
25
25
- use crate :: jsapi :: JS :: { ObjectOpResult , ObjectOpResult_SpecialCodes } ;
26
+ use std :: marker :: PhantomData ;
26
27
use std:: ops:: Deref ;
27
28
use std:: ops:: DerefMut ;
28
29
use std:: os:: raw:: c_void;
@@ -87,7 +88,7 @@ impl<T> JS::Handle<T> {
87
88
pub unsafe fn from_marked_location ( ptr : * const T ) -> JS :: Handle < T > {
88
89
JS :: Handle {
89
90
ptr : ptr as * mut T ,
90
- _phantom_0 : :: std :: marker :: PhantomData ,
91
+ _phantom_0 : PhantomData ,
91
92
}
92
93
}
93
94
}
@@ -96,7 +97,7 @@ impl<T> JS::MutableHandle<T> {
96
97
pub unsafe fn from_marked_location ( ptr : * mut T ) -> JS :: MutableHandle < T > {
97
98
JS :: MutableHandle {
98
99
ptr,
99
- _phantom_0 : :: std :: marker :: PhantomData ,
100
+ _phantom_0 : PhantomData ,
100
101
}
101
102
}
102
103
@@ -379,9 +380,9 @@ impl JSNativeWrapper {
379
380
impl < T > JS :: Rooted < T > {
380
381
pub fn new_unrooted ( ) -> JS :: Rooted < T > {
381
382
JS :: Rooted {
382
- stack : :: std :: ptr:: null_mut ( ) ,
383
- prev : :: std :: ptr:: null_mut ( ) ,
384
- ptr : unsafe { :: std:: mem:: zeroed ( ) } ,
383
+ stack : ptr:: null_mut ( ) ,
384
+ prev : ptr:: null_mut ( ) ,
385
+ ptr : unsafe { std:: mem:: zeroed ( ) } ,
385
386
}
386
387
}
387
388
@@ -523,10 +524,10 @@ impl JS::ObjectOpResult {
523
524
}
524
525
}
525
526
526
- impl Default for ObjectOpResult {
527
- fn default ( ) -> ObjectOpResult {
528
- ObjectOpResult {
529
- code_ : ObjectOpResult_SpecialCodes :: Uninitialized as usize ,
527
+ impl Default for JS :: ObjectOpResult {
528
+ fn default ( ) -> JS :: ObjectOpResult {
529
+ JS :: ObjectOpResult {
530
+ code_ : JS :: ObjectOpResult_SpecialCodes :: Uninitialized as usize ,
530
531
}
531
532
}
532
533
}
@@ -544,3 +545,27 @@ impl JS::ForOfIterator {
544
545
JS_ForOfIteratorNext ( self , val, done)
545
546
}
546
547
}
548
+
549
+ impl < T > mozilla:: Range < T > {
550
+ pub fn new ( start : & mut T , end : & mut T ) -> mozilla:: Range < T > {
551
+ mozilla:: Range {
552
+ mStart : mozilla:: RangedPtr {
553
+ mPtr : start,
554
+ #[ cfg( feature = "debugmozjs" ) ]
555
+ mRangeStart : start,
556
+ #[ cfg( feature = "debugmozjs" ) ]
557
+ mRangeEnd : end,
558
+ _phantom_0 : PhantomData ,
559
+ } ,
560
+ mEnd : mozilla:: RangedPtr {
561
+ mPtr : end,
562
+ #[ cfg( feature = "debugmozjs" ) ]
563
+ mRangeStart : start,
564
+ #[ cfg( feature = "debugmozjs" ) ]
565
+ mRangeEnd : end,
566
+ _phantom_0 : PhantomData ,
567
+ } ,
568
+ _phantom_0 : PhantomData ,
569
+ }
570
+ }
571
+ }
0 commit comments