@@ -116,15 +116,14 @@ pub struct Config {
116116 pub hosts : Vec < Interned < String > > ,
117117 pub targets : Vec < Interned < String > > ,
118118 pub local_rebuild : bool ,
119+ pub jemalloc : bool ,
119120
120121 // dist misc
121122 pub dist_sign_folder : Option < PathBuf > ,
122123 pub dist_upload_addr : Option < String > ,
123124 pub dist_gpg_password_file : Option < PathBuf > ,
124125
125126 // libstd features
126- pub debug_jemalloc : bool ,
127- pub use_jemalloc : bool ,
128127 pub backtrace : bool , // support for RUST_BACKTRACE
129128 pub wasm_syscall : bool ,
130129
@@ -166,7 +165,6 @@ pub struct Target {
166165pub llvm_config : Option < PathBuf > ,
167166 /// Some(path to FileCheck) if one was specified.
168167pub llvm_filecheck : Option < PathBuf > ,
169- pub jemalloc : Option < PathBuf > ,
170168 pub cc : Option < PathBuf > ,
171169 pub cxx : Option < PathBuf > ,
172170 pub ar : Option < PathBuf > ,
@@ -263,7 +261,7 @@ struct Llvm {
263261 link_jobs : Option < u32 > ,
264262 link_shared : Option < bool > ,
265263 version_suffix : Option < String > ,
266- clang_cl : Option < String >
264+ clang_cl : Option < String > ,
267265}
268266
269267#[ derive( Deserialize , Default , Clone ) ]
@@ -302,8 +300,6 @@ struct Rust {
302300 debuginfo_only_std : Option < bool > ,
303301 debuginfo_tools : Option < bool > ,
304302 experimental_parallel_queries : Option < bool > ,
305- debug_jemalloc : Option < bool > ,
306- use_jemalloc : Option < bool > ,
307303 backtrace : Option < bool > ,
308304 default_linker : Option < String > ,
309305 channel : Option < String > ,
@@ -329,6 +325,7 @@ struct Rust {
329325 backtrace_on_ice : Option < bool > ,
330326 verify_llvm_ir : Option < bool > ,
331327 remap_debuginfo : Option < bool > ,
328+ jemalloc : Option < bool > ,
332329}
333330
334331/// TOML representation of how each build target is configured.
@@ -337,7 +334,6 @@ struct Rust {
337334struct TomlTarget {
338335 llvm_config : Option < String > ,
339336 llvm_filecheck : Option < String > ,
340- jemalloc : Option < String > ,
341337 cc : Option < String > ,
342338 cxx : Option < String > ,
343339 ar : Option < String > ,
@@ -363,7 +359,6 @@ impl Config {
363359 config. llvm_enabled = true ;
364360 config. llvm_optimize = true ;
365361 config. llvm_version_check = true ;
366- config. use_jemalloc = true ;
367362 config. backtrace = true ;
368363 config. rust_optimize = true ;
369364 config. rust_optimize_tests = true ;
@@ -499,7 +494,6 @@ impl Config {
499494 let mut debuginfo_only_std = None ;
500495 let mut debuginfo_tools = None ;
501496 let mut debug = None ;
502- let mut debug_jemalloc = None ;
503497 let mut debuginfo = None ;
504498 let mut debug_assertions = None ;
505499 let mut optimize = None ;
@@ -541,12 +535,11 @@ impl Config {
541535 debuginfo_tools = rust. debuginfo_tools ;
542536 optimize = rust. optimize ;
543537 ignore_git = rust. ignore_git ;
544- debug_jemalloc = rust. debug_jemalloc ;
545538 set ( & mut config. rust_optimize_tests , rust. optimize_tests ) ;
546539 set ( & mut config. rust_debuginfo_tests , rust. debuginfo_tests ) ;
547540 set ( & mut config. codegen_tests , rust. codegen_tests ) ;
548541 set ( & mut config. rust_rpath , rust. rpath ) ;
549- set ( & mut config. use_jemalloc , rust. use_jemalloc ) ;
542+ set ( & mut config. jemalloc , rust. jemalloc ) ;
550543 set ( & mut config. backtrace , rust. backtrace ) ;
551544 set ( & mut config. channel , rust. channel . clone ( ) ) ;
552545 set ( & mut config. rust_dist_src , rust. dist_src ) ;
@@ -596,9 +589,6 @@ impl Config {
596589 if let Some ( ref s) = cfg. llvm_filecheck {
597590 target. llvm_filecheck = Some ( config. src . join ( s) ) ;
598591 }
599- if let Some ( ref s) = cfg. jemalloc {
600- target. jemalloc = Some ( config. src . join ( s) ) ;
601- }
602592 if let Some ( ref s) = cfg. android_ndk {
603593 target. ndk = Some ( config. src . join ( s) ) ;
604594 }
@@ -644,7 +634,6 @@ impl Config {
644634 config. rust_debuginfo_tools = debuginfo_tools. unwrap_or ( false ) ;
645635
646636 let default = debug == Some ( true ) ;
647- config. debug_jemalloc = debug_jemalloc. unwrap_or ( default) ;
648637 config. rust_debuginfo = debuginfo. unwrap_or ( default) ;
649638 config. rust_debug_assertions = debug_assertions. unwrap_or ( default) ;
650639
0 commit comments