File tree 1 file changed +8
-6
lines changed
1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -16,16 +16,16 @@ A simple wrapper over the platform's dynamic library facilities
16
16
17
17
*/
18
18
19
+
19
20
use c_str:: ToCStr ;
20
- use iter:: Iterator ;
21
21
use mem;
22
22
use ops:: * ;
23
23
use option:: * ;
24
24
use os;
25
25
use path:: GenericPath ;
26
26
use path;
27
27
use result:: * ;
28
- use slice:: { Vector , OwnedVector } ;
28
+ use slice:: Vector ;
29
29
use str;
30
30
use vec:: Vec ;
31
31
@@ -75,10 +75,12 @@ impl DynamicLibrary {
75
75
} else {
76
76
( "LD_LIBRARY_PATH" , ':' as u8 )
77
77
} ;
78
- let newenv = os:: getenv_as_bytes ( envvar) . unwrap_or ( box [ ] ) ;
79
- let mut newenv = newenv. move_iter ( ) . collect :: < Vec < _ > > ( ) ;
80
- newenv. push_all ( & [ sep] ) ;
81
- newenv. push_all ( path. as_vec ( ) ) ;
78
+ let mut newenv = Vec :: from_slice ( path. as_vec ( ) ) ;
79
+ newenv. push ( sep) ;
80
+ match os:: getenv_as_bytes ( envvar) {
81
+ Some ( bytes) => newenv. push_all ( bytes) ,
82
+ None => { }
83
+ }
82
84
os:: setenv ( envvar, str:: from_utf8 ( newenv. as_slice ( ) ) . unwrap ( ) ) ;
83
85
}
84
86
You can’t perform that action at this time.
0 commit comments