Auto merge of rust-lang#118823 - GuillaumeGomez:rollup-6v51gxv, r=GuillaumeGomez

bors · bors · commit e5e5bc6978bf · 2023-12-11T12:33:04.000Z
Rollup of 3 pull requests Successful merges: - rust-lang#118802 (Remove edition umbrella features.) - rust-lang#118807 (Remove an allocation in min_stack) - rust-lang#118812 (rustdoc-search: do not treat associated type names as types) r? `@ghost` `@rustbot` modify labels: rollup
diff --git a/std/src/sys_common/thread.rs b/std/src/sys_common/thread.rs
@@ -8,7 +8,7 @@ pub fn min_stack() -> usize {
         0 => {}
         n => return n - 1,
     }
-    let amt = env::var("RUST_MIN_STACK").ok().and_then(|s| s.parse().ok());
+    let amt = env::var_os("RUST_MIN_STACK").and_then(|s| s.to_str().and_then(|s| s.parse().ok()));
     let amt = amt.unwrap_or(imp::DEFAULT_MIN_STACK_SIZE);
 
     // 0 is our sentinel value, so ensure that we'll never see 0 after

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pub fn min_stack() -> usize {`
`8`	`8`	`0 => {}`
`9`	`9`	`n => return n - 1,`
`10`	`10`	`}`
`11`		`- let amt = env::var("RUST_MIN_STACK").ok().and_then(\|s\| s.parse().ok());`
	`11`	`+ let amt = env::var_os("RUST_MIN_STACK").and_then(\|s\| s.to_str().and_then(\|s\| s.parse().ok()));`
`12`	`12`	`let amt = amt.unwrap_or(imp::DEFAULT_MIN_STACK_SIZE);`
`13`	`13`
`14`	`14`	`// 0 is our sentinel value, so ensure that we'll never see 0 after`