From 68bb7cb071afa670450f910c2d421d523e6af9e3 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 26 Sep 2024 19:14:17 -0400 Subject: [PATCH 1/7] Update cc to 1.0.100 --- library/Cargo.lock | 4 ++-- library/profiler_builtins/Cargo.toml | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index 2343b2baf8347..9eaf0e57730c1 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -42,9 +42,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "cc" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" [[package]] name = "cfg-if" diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index 5b10fb5a2bd3f..33f4df3a2a45c 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -13,4 +13,6 @@ core = { path = "../core" } compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } [build-dependencies] -cc = "1.0.97" +# FIXME: updates past a certain point haven't been able to merge successfully. +# See rust-lang/rust#130720. +cc = "=1.0.100" From 09e43e66bbb8bbcc449e69aa3a072d8a0fa75d02 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 26 Sep 2024 21:15:32 -0400 Subject: [PATCH 2/7] Update cc to 1.0.101 --- library/Cargo.lock | 4 ++-- library/profiler_builtins/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index 9eaf0e57730c1..f936073838d58 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -42,9 +42,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "cc" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" [[package]] name = "cfg-if" diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index 33f4df3a2a45c..9592320cc5784 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -15,4 +15,4 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } [build-dependencies] # FIXME: updates past a certain point haven't been able to merge successfully. # See rust-lang/rust#130720. -cc = "=1.0.100" +cc = "=1.0.101" From e52d2bee4089547d67ba72d66fafd3fcd8426bf5 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 26 Sep 2024 21:16:59 -0400 Subject: [PATCH 3/7] Update cc to 1.0.103 --- library/Cargo.lock | 4 ++-- library/profiler_builtins/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index f936073838d58..9c6d20c8f7684 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -42,9 +42,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "cc" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" +checksum = "2755ff20a1d93490d26ba33a6f092a38a508398a5320df5d4b3014fcccce9410" [[package]] name = "cfg-if" diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index 9592320cc5784..bb834986d0ba0 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -15,4 +15,4 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } [build-dependencies] # FIXME: updates past a certain point haven't been able to merge successfully. # See rust-lang/rust#130720. -cc = "=1.0.101" +cc = "=1.0.103" From d5f2e5d91b6c9b14a33a1388f5d251d44c6270cd Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 26 Sep 2024 21:28:09 -0400 Subject: [PATCH 4/7] Update cc to 1.0.104 --- library/Cargo.lock | 4 ++-- library/profiler_builtins/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index 9c6d20c8f7684..af1b10716d0cc 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -42,9 +42,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "cc" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2755ff20a1d93490d26ba33a6f092a38a508398a5320df5d4b3014fcccce9410" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" [[package]] name = "cfg-if" diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index bb834986d0ba0..c5243b6befc3d 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -15,4 +15,4 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } [build-dependencies] # FIXME: updates past a certain point haven't been able to merge successfully. # See rust-lang/rust#130720. -cc = "=1.0.103" +cc = "=1.0.104" From a39a92e508dc3386cf57ccb55c7b23f8e5502959 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 26 Sep 2024 21:32:25 -0400 Subject: [PATCH 5/7] Update cc to 1.0.105 --- library/Cargo.lock | 4 ++-- library/profiler_builtins/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index af1b10716d0cc..0d110b76b77ca 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -42,9 +42,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "cc" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" [[package]] name = "cfg-if" diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index c5243b6befc3d..d7b5c9fc0fb7e 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -15,4 +15,4 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } [build-dependencies] # FIXME: updates past a certain point haven't been able to merge successfully. # See rust-lang/rust#130720. -cc = "=1.0.104" +cc = "=1.0.105" From a4a9132336a05dd632ad754fca8f35d450d23a63 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 26 Sep 2024 23:43:42 -0400 Subject: [PATCH 6/7] Pin library cc to 1.0.100 --- library/Cargo.lock | 4 ++-- library/profiler_builtins/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index 0d110b76b77ca..9eaf0e57730c1 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -42,9 +42,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "cc" -version = "1.0.105" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" +checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" [[package]] name = "cfg-if" diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index d7b5c9fc0fb7e..33f4df3a2a45c 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -15,4 +15,4 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } [build-dependencies] # FIXME: updates past a certain point haven't been able to merge successfully. # See rust-lang/rust#130720. -cc = "=1.0.105" +cc = "=1.0.100" From 3c840fdeca7a88e3e2ffefadf9e38388992fa6f5 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Fri, 27 Sep 2024 06:38:56 -0400 Subject: [PATCH 7/7] Update cc to 1.1.22 --- library/Cargo.lock | 13 +++++++++++-- library/profiler_builtins/Cargo.toml | 4 +--- src/tools/tidy/src/deps.rs | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index 9eaf0e57730c1..913b75d5d3ee7 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -42,9 +42,12 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "cc" -version = "1.0.100" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -312,6 +315,12 @@ dependencies = [ "std", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "std" version = "0.0.0" diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index 33f4df3a2a45c..4631c2ebbb2ac 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -13,6 +13,4 @@ core = { path = "../core" } compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } [build-dependencies] -# FIXME: updates past a certain point haven't been able to merge successfully. -# See rust-lang/rust#130720. -cc = "=1.0.100" +cc = "1.1.22" diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index b880f312715ec..698fb42180f0c 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -481,6 +481,7 @@ const PERMITTED_STDLIB_DEPENDENCIES: &[&str] = &[ "rand_core", "rand_xorshift", "rustc-demangle", + "shlex", "unicode-width", "unwinding", "wasi",