diff options
Diffstat (limited to 'meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch')
-rw-r--r-- | meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch | 98 |
1 files changed, 75 insertions, 23 deletions
diff --git a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch b/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch index b9cc7af1d8..164f2eb87c 100644 --- a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch +++ b/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | rust: reproducibility issue fix with v1.78 | 1 | rust: reproducibility issue fix with v1.79 |
2 | 2 | ||
3 | A few crates are using the updated version of the 'cc' crate and this is causing the generated object file names containing a unique hashmap id. | 3 | A few crates are using the updated version of the 'cc' crate and this is causing the generated object file names containing a unique hashmap id. |
4 | The hashmap addition to generated files is reverted here. | 4 | The hashmap addition to generated files is reverted here. |
@@ -8,30 +8,29 @@ https://github.com/rust-lang/cc-rs/issues/1117 | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [https://github.com/rust-lang/cc-rs/issues/1117] | 9 | Upstream-Status: Inappropriate [https://github.com/rust-lang/cc-rs/issues/1117] |
10 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | 10 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> |
11 | --- a/vendor/cc-1.0.83/src/lib.rs | 11 | --- a/vendor/cc-1.0.79/src/lib.rs |
12 | +++ b/vendor/cc-1.0.83/src/lib.rs | 12 | +++ b/vendor/cc-1.0.79/src/lib.rs |
13 | @@ -54,12 +54,11 @@ | 13 | @@ -56,12 +56,11 @@ |
14 | #![allow(deprecated)] | ||
14 | #![deny(missing_docs)] | 15 | #![deny(missing_docs)] |
15 | 16 | ||
16 | use std::borrow::Cow; | ||
17 | -use std::collections::{hash_map, HashMap}; | 17 | -use std::collections::{hash_map, HashMap}; |
18 | +use std::collections::HashMap; | 18 | +use std::collections::HashMap; |
19 | use std::env; | 19 | use std::env; |
20 | use std::ffi::{OsStr, OsString}; | 20 | use std::ffi::{OsStr, OsString}; |
21 | use std::fmt::{self, Display, Formatter}; | 21 | use std::fmt::{self, Display, Formatter}; |
22 | use std::fs::{self, File}; | 22 | use std::fs; |
23 | -use std::hash::Hasher; | 23 | -use std::hash::Hasher; |
24 | use std::io::{self, BufRead, BufReader, Read, Write}; | 24 | use std::io::{self, BufRead, BufReader, Read, Write}; |
25 | use std::path::{Component, Path, PathBuf}; | 25 | use std::path::{Component, Path, PathBuf}; |
26 | use std::process::{Child, Command, Stdio}; | 26 | use std::process::{Child, Command, Stdio}; |
27 | @@ -1108,25 +1107,7 @@ | 27 | @@ -1037,24 +1036,7 @@ |
28 | 28 | ||
29 | let mut objects = Vec::new(); | 29 | let mut objects = Vec::new(); |
30 | for file in self.files.iter() { | 30 | for file in self.files.iter() { |
31 | - let obj = if file.has_root() || file.components().any(|x| x == Component::ParentDir) { | 31 | - let obj = if file.has_root() { |
32 | - // If `file` is an absolute path or might not be usable directly as a suffix due to | 32 | - // If `file` is an absolute path, prefix the `basename` |
33 | - // using "..", use the `basename` prefixed with the `dirname`'s hash to ensure name | 33 | - // with the `dirname`'s hash to ensure name uniqueness. |
34 | - // uniqueness. | ||
35 | - let basename = file | 34 | - let basename = file |
36 | - .file_name() | 35 | - .file_name() |
37 | - .ok_or_else(|| Error::new(ErrorKind::InvalidArgument, "file_name() failure"))? | 36 | - .ok_or_else(|| Error::new(ErrorKind::InvalidArgument, "file_name() failure"))? |
@@ -51,17 +50,17 @@ Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | |||
51 | let obj = if !obj.starts_with(&dst) { | 50 | let obj = if !obj.starts_with(&dst) { |
52 | dst.join(obj.file_name().ok_or_else(|| { | 51 | dst.join(obj.file_name().ok_or_else(|| { |
53 | Error::new(ErrorKind::IOError, "Getting object file details failed.") | 52 | Error::new(ErrorKind::IOError, "Getting object file details failed.") |
54 | --- a/vendor/cc-1.0.83/.cargo-checksum.json | 53 | --- a/vendor/cc-1.0.79/.cargo-checksum.json |
55 | +++ b/vendor/cc-1.0.83/.cargo-checksum.json | 54 | +++ b/vendor/cc-1.0.79/.cargo-checksum.json |
56 | @@ -1 +1 @@ | 55 | @@ -1 +1 @@ |
57 | -{"files":{"Cargo.lock":"f36b5fb99e6a2272cb5ad088fb7e21baa135c5335f9babfd3d6e79cd915d5082","Cargo.toml":"2be00f2836c949a6ff7120610ee0191a6d12d50f141aafd6622d4c2e932f0d71","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"fe18a56553aa54cbef39b659e98340ddf4dbb18f156e7b34a8be25d97e4d123f","src/bin/gcc-shim.rs":"36dc4e447428e73c548cc7106ca1e8f282c098463b014e13a729a44445de4880","src/com.rs":"cf188faf2651f613ee5c38fd6af29188ff4b0c3036b615874bce0e3b6e61a96f","src/lib.rs":"cdf0c6dc4e12ad313fb93ab42f994e26c7e5aaeb07ca61620032d8f4014dacd0","src/os_pipe.rs":"5b950b491b93226885c34a9070387c081f50029fdf19770bb983bca2a64aa705","src/os_pipe/unix.rs":"64a765352b3e94c4590d11f99824dc60a887fe5bc61eba81398aab1180908f55","src/os_pipe/windows.rs":"fa35d5b6adb83a8442ec06b08f3d30631ac7b8513f3cf8b3986d27b7ee58cf93","src/registry.rs":"d888d22abd8a32a61562529274b2d5d2f9e5a3bfa754589d6beb04b740144771","src/setup_config.rs":"5fee84b80d089ae4a92f10080b072ea2bb32c2edbcdc759cb9072e380404fc46","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"132a7c23d57911db0bef03446cd106e7f75818096132522219d72b9d2a8f247f","src/windows_registry.rs":"c58ae361caf3b6f13dff515e25b3a7e5cf443bb9470d2d347784b5872c3de06d","src/windows_sys.rs":"ff7cdf4450db85c8704dfd3aa765dd62da24f0650825457094405af82958f688","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"a3c8d116973bb16066bf6ec4de5143183f97de7aad085d85f8118a2eaac3e1e0","tests/test.rs":"bab74eb7e7a383cb5da4143e74c26ddfa3e7162b5f46c1d46a722250e925444d"},"package":"f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"} | 56 | -{"files":{"Cargo.lock":"dddb9c49058d411a098e98dc1c06e3bc89f859a2080d96c11b11aec67394bb8c","Cargo.toml":"1953a8bc4b98e351fe75917c151b1e08a46531d562aebba25a90add4aadecac2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"58af5106352aafa62175a90f8a5f25fa114028bf909220dc0735d79745999ec1","src/bin/gcc-shim.rs":"36dc4e447428e73c548cc7106ca1e8f282c098463b014e13a729a44445de4880","src/com.rs":"29d0dee08a656ab1a4cc3e5fe24542e0fab5c1373cbc9b05059f7572cf9b8313","src/lib.rs":"17a4659710aa290c4ed9c23063c7b202c5bcf2a84de33aa1f01fc6fded69a1f8","src/registry.rs":"98ae2b71781acc49297e5544fa0cf059f735636f8f1338edef8dbf7232443945","src/setup_config.rs":"72deaf1927c0b713fd5c2b2d5b8f0ea3a303a00fda1579427895cac26a94122d","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"e128e95b2d39ae7a02f54a7e25d33c488c14759b9f1a50a449e10545856950c3","src/windows_registry.rs":"1f973f804b4b451e48ff6d98ce660355772f164dfdf79a6ae514645c7c764005","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"a3c8d116973bb16066bf6ec4de5143183f97de7aad085d85f8118a2eaac3e1e0","tests/test.rs":"61fb35ae6dd5cf506ada000bdd82c92e9f8eac9cc053b63e83d3f897436fbf8f"},"package":"50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"} |
58 | \ No newline at end of file | 57 | \ No newline at end of file |
59 | +{"files":{"Cargo.lock":"f36b5fb99e6a2272cb5ad088fb7e21baa135c5335f9babfd3d6e79cd915d5082","Cargo.toml":"2be00f2836c949a6ff7120610ee0191a6d12d50f141aafd6622d4c2e932f0d71","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"fe18a56553aa54cbef39b659e98340ddf4dbb18f156e7b34a8be25d97e4d123f","src/bin/gcc-shim.rs":"36dc4e447428e73c548cc7106ca1e8f282c098463b014e13a729a44445de4880","src/com.rs":"cf188faf2651f613ee5c38fd6af29188ff4b0c3036b615874bce0e3b6e61a96f","src/lib.rs":"c5a1ae53355aae6da9179faa7c46277fc86d9ca46e37a0eb296cd92eb3f0ca72","src/os_pipe.rs":"5b950b491b93226885c34a9070387c081f50029fdf19770bb983bca2a64aa705","src/os_pipe/unix.rs":"64a765352b3e94c4590d11f99824dc60a887fe5bc61eba81398aab1180908f55","src/os_pipe/windows.rs":"fa35d5b6adb83a8442ec06b08f3d30631ac7b8513f3cf8b3986d27b7ee58cf93","src/registry.rs":"d888d22abd8a32a61562529274b2d5d2f9e5a3bfa754589d6beb04b740144771","src/setup_config.rs":"5fee84b80d089ae4a92f10080b072ea2bb32c2edbcdc759cb9072e380404fc46","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"132a7c23d57911db0bef03446cd106e7f75818096132522219d72b9d2a8f247f","src/windows_registry.rs":"c58ae361caf3b6f13dff515e25b3a7e5cf443bb9470d2d347784b5872c3de06d","src/windows_sys.rs":"ff7cdf4450db85c8704dfd3aa765dd62da24f0650825457094405af82958f688","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"a3c8d116973bb16066bf6ec4de5143183f97de7aad085d85f8118a2eaac3e1e0","tests/test.rs":"bab74eb7e7a383cb5da4143e74c26ddfa3e7162b5f46c1d46a722250e925444d"},"package":"f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"} | 58 | +{"files":{"Cargo.lock":"dddb9c49058d411a098e98dc1c06e3bc89f859a2080d96c11b11aec67394bb8c","Cargo.toml":"1953a8bc4b98e351fe75917c151b1e08a46531d562aebba25a90add4aadecac2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"58af5106352aafa62175a90f8a5f25fa114028bf909220dc0735d79745999ec1","src/bin/gcc-shim.rs":"36dc4e447428e73c548cc7106ca1e8f282c098463b014e13a729a44445de4880","src/com.rs":"29d0dee08a656ab1a4cc3e5fe24542e0fab5c1373cbc9b05059f7572cf9b8313","src/lib.rs":"dfb36b17362e9a5b266cb19a229d982e8c0bba784b1e99769f690692b0cd5c4e","src/registry.rs":"98ae2b71781acc49297e5544fa0cf059f735636f8f1338edef8dbf7232443945","src/setup_config.rs":"72deaf1927c0b713fd5c2b2d5b8f0ea3a303a00fda1579427895cac26a94122d","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"e128e95b2d39ae7a02f54a7e25d33c488c14759b9f1a50a449e10545856950c3","src/windows_registry.rs":"1f973f804b4b451e48ff6d98ce660355772f164dfdf79a6ae514645c7c764005","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"a3c8d116973bb16066bf6ec4de5143183f97de7aad085d85f8118a2eaac3e1e0","tests/test.rs":"61fb35ae6dd5cf506ada000bdd82c92e9f8eac9cc053b63e83d3f897436fbf8f"},"package":"50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"} |
60 | --- a/vendor/cc/src/command_helpers.rs | 59 | --- a/vendor/cc-1.0.90/src/command_helpers.rs |
61 | +++ b/vendor/cc/src/command_helpers.rs | 60 | +++ b/vendor/cc-1.0.90/src/command_helpers.rs |
62 | @@ -1,11 +1,9 @@ | 61 | @@ -1,11 +1,9 @@ |
63 | //! Miscellaneous helpers for running commands | 62 | //! Miscellaneous helpers for running commands |
64 | 63 | ||
65 | use std::{ | 64 | use std::{ |
66 | - collections::hash_map, | 65 | - collections::hash_map, |
67 | ffi::OsString, | 66 | ffi::OsString, |
@@ -71,7 +70,7 @@ Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | |||
71 | io::{self, Read, Write}, | 70 | io::{self, Read, Write}, |
72 | path::Path, | 71 | path::Path, |
73 | process::{Child, ChildStderr, Command, Stdio}, | 72 | process::{Child, ChildStderr, Command, Stdio}, |
74 | @@ -254,32 +254,7 @@ | 73 | @@ -254,32 +252,7 @@ |
75 | pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<Object>, Error> { | 74 | pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<Object>, Error> { |
76 | let mut objects = Vec::with_capacity(files.len()); | 75 | let mut objects = Vec::with_capacity(files.len()); |
77 | for file in files { | 76 | for file in files { |
@@ -102,13 +101,66 @@ Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | |||
102 | - .join(format!("{:016x}-{}", hasher.finish(), basename)) | 101 | - .join(format!("{:016x}-{}", hasher.finish(), basename)) |
103 | - .with_extension("o"); | 102 | - .with_extension("o"); |
104 | + let obj = dst.join(file).with_extension("o"); | 103 | + let obj = dst.join(file).with_extension("o"); |
105 | 104 | ||
106 | match obj.parent() { | 105 | match obj.parent() { |
107 | Some(s) => fs::create_dir_all(s)?, | 106 | Some(s) => fs::create_dir_all(s)?, |
108 | --- a/vendor/cc/.cargo-checksum.json | 107 | --- a/vendor/cc-1.0.90/.cargo-checksum.json |
109 | +++ b/vendor/cc/.cargo-checksum.json | 108 | +++ b/vendor/cc-1.0.90/.cargo-checksum.json |
110 | @@ -1 +1 @@ | 109 | @@ -1 +1 @@ |
111 | -{"files":{"Cargo.toml":"ad60f12609a272a3d052258f9521807fd627181125e84dd988ddb2b2e7dfedf6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"3ef95bdcd79a43406fdab275d8a8f45ba787876399b54df34068955ec0109e69","src/lib.rs":"71e55cf18e32dab3b9feae2add4ff57932a10084cc5aad4680c12eb3a91ed124","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"0676c3177b5be9d7ede483bf4bd45c5ca0f5511073e4d1c9f181a0bc83db05dc","src/parallel/mod.rs":"aaffed5ad3dc0d28641533ab0d6f522bf34a059d4b1a239dc4d217cb5d58e232","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/tool.rs":"172cfcbecd7c6a363ea841a48a10a75b0a01e83b83c0691107c601598b68dedf","src/windows/com.rs":"be1564756c9f3ef1398eafeed7b54ba610caba28e8f6258d28a997737ebf9535","src/windows/find_tools.rs":"f6f391294511c376c3ce10ac2fd29967fe6f21d256d9575d8733c1c7cb1befde","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"f6b90b87f23e446284bde86749b53858c0d37b8a43515ed8d0e90b1ac8cf7771"},"package":"8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"} | 110 | -{"files":{"Cargo.toml":"ad60f12609a272a3d052258f9521807fd627181125e84dd988ddb2b2e7dfedf6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"3ef95bdcd79a43406fdab275d8a8f45ba787876399b54df34068955ec0109e69","src/lib.rs":"71e55cf18e32dab3b9feae2add4ff57932a10084cc5aad4680c12eb3a91ed124","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"0676c3177b5be9d7ede483bf4bd45c5ca0f5511073e4d1c9f181a0bc83db05dc","src/parallel/mod.rs":"aaffed5ad3dc0d28641533ab0d6f522bf34a059d4b1a239dc4d217cb5d58e232","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/tool.rs":"172cfcbecd7c6a363ea841a48a10a75b0a01e83b83c0691107c601598b68dedf","src/windows/com.rs":"be1564756c9f3ef1398eafeed7b54ba610caba28e8f6258d28a997737ebf9535","src/windows/find_tools.rs":"f6f391294511c376c3ce10ac2fd29967fe6f21d256d9575d8733c1c7cb1befde","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"f6b90b87f23e446284bde86749b53858c0d37b8a43515ed8d0e90b1ac8cf7771"},"package":"8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"} |
112 | \ No newline at end of file | 111 | \ No newline at end of file |
113 | +{"files":{"Cargo.toml":"ad60f12609a272a3d052258f9521807fd627181125e84dd988ddb2b2e7dfedf6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"0977a08e49a78e4065858e650a7e92151806e247b542b87cbbeee96a9177153c","src/lib.rs":"71e55cf18e32dab3b9feae2add4ff57932a10084cc5aad4680c12eb3a91ed124","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"0676c3177b5be9d7ede483bf4bd45c5ca0f5511073e4d1c9f181a0bc83db05dc","src/parallel/mod.rs":"aaffed5ad3dc0d28641533ab0d6f522bf34a059d4b1a239dc4d217cb5d58e232","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/tool.rs":"172cfcbecd7c6a363ea841a48a10a75b0a01e83b83c0691107c601598b68dedf","src/windows/com.rs":"be1564756c9f3ef1398eafeed7b54ba610caba28e8f6258d28a997737ebf9535","src/windows/find_tools.rs":"f6f391294511c376c3ce10ac2fd29967fe6f21d256d9575d8733c1c7cb1befde","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"f6b90b87f23e446284bde86749b53858c0d37b8a43515ed8d0e90b1ac8cf7771"},"package":"8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"} | 112 | +{"files":{"Cargo.toml":"ad60f12609a272a3d052258f9521807fd627181125e84dd988ddb2b2e7dfedf6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"0977a08e49a78e4065858e650a7e92151806e247b542b87cbbeee96a9177153c","src/lib.rs":"71e55cf18e32dab3b9feae2add4ff57932a10084cc5aad4680c12eb3a91ed124","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"0676c3177b5be9d7ede483bf4bd45c5ca0f5511073e4d1c9f181a0bc83db05dc","src/parallel/mod.rs":"aaffed5ad3dc0d28641533ab0d6f522bf34a059d4b1a239dc4d217cb5d58e232","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/tool.rs":"172cfcbecd7c6a363ea841a48a10a75b0a01e83b83c0691107c601598b68dedf","src/windows/com.rs":"be1564756c9f3ef1398eafeed7b54ba610caba28e8f6258d28a997737ebf9535","src/windows/find_tools.rs":"f6f391294511c376c3ce10ac2fd29967fe6f21d256d9575d8733c1c7cb1befde","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"f6b90b87f23e446284bde86749b53858c0d37b8a43515ed8d0e90b1ac8cf7771"},"package":"8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"} |
114 | 113 | --- a/vendor/cc-1.0.92/src/command_helpers.rs | |
114 | +++ b/vendor/cc-1.0.92/src/command_helpers.rs | ||
115 | @@ -1,11 +1,9 @@ | ||
116 | //! Miscellaneous helpers for running commands | ||
117 | |||
118 | use std::{ | ||
119 | - collections::hash_map, | ||
120 | ffi::OsString, | ||
121 | fmt::Display, | ||
122 | fs, | ||
123 | - hash::Hasher, | ||
124 | io::{self, Read, Write}, | ||
125 | path::Path, | ||
126 | process::{Child, ChildStderr, Command, Stdio}, | ||
127 | @@ -258,32 +256,7 @@ | ||
128 | pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<Object>, Error> { | ||
129 | let mut objects = Vec::with_capacity(files.len()); | ||
130 | for file in files { | ||
131 | - let basename = file | ||
132 | - .file_name() | ||
133 | - .ok_or_else(|| { | ||
134 | - Error::new( | ||
135 | - ErrorKind::InvalidArgument, | ||
136 | - "No file_name for object file path!", | ||
137 | - ) | ||
138 | - })? | ||
139 | - .to_string_lossy(); | ||
140 | - let dirname = file | ||
141 | - .parent() | ||
142 | - .ok_or_else(|| { | ||
143 | - Error::new( | ||
144 | - ErrorKind::InvalidArgument, | ||
145 | - "No parent for object file path!", | ||
146 | - ) | ||
147 | - })? | ||
148 | - .to_string_lossy(); | ||
149 | - | ||
150 | - // Hash the dirname. This should prevent conflicts if we have multiple | ||
151 | - // object files with the same filename in different subfolders. | ||
152 | - let mut hasher = hash_map::DefaultHasher::new(); | ||
153 | - hasher.write(dirname.to_string().as_bytes()); | ||
154 | - let obj = dst | ||
155 | - .join(format!("{:016x}-{}", hasher.finish(), basename)) | ||
156 | - .with_extension("o"); | ||
157 | + let obj = dst.join(file).with_extension("o"); | ||
158 | |||
159 | match obj.parent() { | ||
160 | Some(s) => fs::create_dir_all(s)?, | ||
161 | --- a/vendor/cc-1.0.92/.cargo-checksum.json | ||
162 | +++ b/vendor/cc-1.0.92/.cargo-checksum.json | ||
163 | @@ -1 +1 @@ | ||
164 | -{"files":{"Cargo.toml":"3874a391e743987dfdb8719b2fedf6ea9bfd83d13a465b0c14cf25251f639799","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"15afbc35930a5a53f00d74a8910cff35caeb5511c26642cffe5630377aced901","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"4b65bc0145f64942ed8f480ab93068e85620968d28de200f06553160dec5975e","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"0676c3177b5be9d7ede483bf4bd45c5ca0f5511073e4d1c9f181a0bc83db05dc","src/parallel/mod.rs":"aaffed5ad3dc0d28641533ab0d6f522bf34a059d4b1a239dc4d217cb5d58e232","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"3e6cf011d4fe52065db2716277661342eb8ab9f2516fda4c551d0dc0fe0d9c87","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"b48a7a0efbeb24dc4ccdb4326583ef074e69c670330681a5be9d5c19492e5f96","src/windows/com.rs":"be1564756c9f3ef1398eafeed7b54ba610caba28e8f6258d28a997737ebf9535","src/windows/find_tools.rs":"dcaa6224a0b00298c1421ade505cec31268ee6c477d982a08ed0a3433681c3f6","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"} | ||
165 | \ No newline at end of file | ||
166 | +{"files":{"Cargo.toml":"3874a391e743987dfdb8719b2fedf6ea9bfd83d13a465b0c14cf25251f639799","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"edff7d8ad5d6f7064ea1ec9ec816f055f87cbe0cd8d505687a67fd544ad7eb11","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"4b65bc0145f64942ed8f480ab93068e85620968d28de200f06553160dec5975e","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"0676c3177b5be9d7ede483bf4bd45c5ca0f5511073e4d1c9f181a0bc83db05dc","src/parallel/mod.rs":"aaffed5ad3dc0d28641533ab0d6f522bf34a059d4b1a239dc4d217cb5d58e232","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"3e6cf011d4fe52065db2716277661342eb8ab9f2516fda4c551d0dc0fe0d9c87","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"b48a7a0efbeb24dc4ccdb4326583ef074e69c670330681a5be9d5c19492e5f96","src/windows/com.rs":"be1564756c9f3ef1398eafeed7b54ba610caba28e8f6258d28a997737ebf9535","src/windows/find_tools.rs":"dcaa6224a0b00298c1421ade505cec31268ee6c477d982a08ed0a3433681c3f6","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"} | ||