diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-10-08 05:02:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-08 05:02:44 +0200 |
| commit | bc7df81642fccf42c4250760e8a4c1ff298feec8 (patch) | |
| tree | b3269265811fe9edfd90dd3994be24d45f01c00d /src/libstd | |
| parent | f23c9f4565b38c2600158275fe8ac739e13cf7d6 (diff) | |
| parent | 45f7186de35f3e944ac8ed21105b924ba30d1aa4 (diff) | |
| download | rust-bc7df81642fccf42c4250760e8a4c1ff298feec8.tar.gz rust-bc7df81642fccf42c4250760e8a4c1ff298feec8.zip | |
Rollup merge of #65187 - Wind-River:master_before_merge, r=rkruppe
use 'invalid argument' for vxWorks vxWorks is using "invalid argument" instead of "Invalid argument" in reporting invalid options r? @rkruppe
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 8933f027a06..fc26dcb3211 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -3112,8 +3112,10 @@ mod tests { #[cfg(windows)] let invalid_options = 87; // ERROR_INVALID_PARAMETER - #[cfg(unix)] + #[cfg(all(unix, not(target_os = "vxworks")))] let invalid_options = "Invalid argument"; + #[cfg(target_os = "vxworks")] + let invalid_options = "invalid argument"; // Test various combinations of creation modes and access modes. // |