diff --git a/Cargo.lock b/Cargo.lock index fd65ed8d4a2d6..43536732f74f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2847,9 +2847,8 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69" +version = "0.1.17" +source = "git+https://github.com/hkratz/stacker.git?rev=f2b4078e0c32adffeed3c62ae7e152dbd18fd32b#f2b4078e0c32adffeed3c62ae7e152dbd18fd32b" dependencies = [ "cc", ] @@ -4760,8 +4759,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90939d5171a4420b3ff5fbc8954d641e7377335454c259dcb80786f3f21dc9b4" +source = "git+https://github.com/hkratz/stacker.git?rev=f2b4078e0c32adffeed3c62ae7e152dbd18fd32b#f2b4078e0c32adffeed3c62ae7e152dbd18fd32b" dependencies = [ "cc", "cfg-if 1.0.0", diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index ad296c97659d2..484185b3407a1 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -25,7 +25,7 @@ rustc_index = { path = "../rustc_index", package = "rustc_index" } bitflags = "1.2.1" measureme = "10.0.0" libc = "0.2" -stacker = "0.1.14" +stacker = { git = "https://github.com/hkratz/stacker.git", rev = "f2b4078e0c32adffeed3c62ae7e152dbd18fd32b", features = ["fast_path_optimization"] } tempfile = "3.2" [dependencies.parking_lot] diff --git a/compiler/rustc_data_structures/src/stack.rs b/compiler/rustc_data_structures/src/stack.rs index a4964b7aa0cc8..3bdd67512321b 100644 --- a/compiler/rustc_data_structures/src/stack.rs +++ b/compiler/rustc_data_structures/src/stack.rs @@ -12,6 +12,7 @@ const STACK_PER_RECURSION: usize = 1 * 1024 * 1024; // 1MB /// from this. /// /// Should not be sprinkled around carelessly, as it causes a little bit of overhead. +#[inline] pub fn ensure_sufficient_stack(f: impl FnOnce() -> R) -> R { stacker::maybe_grow(RED_ZONE, STACK_PER_RECURSION, f) } diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index aad57cacbb41e..3e8e84b311200 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -4,7 +4,10 @@ use std::fs; use std::path::Path; /// List of allowed sources for packages. -const ALLOWED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\""]; +const ALLOWED_SOURCES: &[&str] = &[ + "\"registry+https://github.com/rust-lang/crates.io-index\"", + "\"git+https://github.com/hkratz/stacker.git?rev=f2b4078e0c32adffeed3c62ae7e152dbd18fd32b#f2b4078e0c32adffeed3c62ae7e152dbd18fd32b\"", +]; /// Checks for external package sources. `root` is the path to the directory that contains the /// workspace `Cargo.toml`.