Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fed12fa
Remove mentions of removed `offset_to` method
phil-opp Jun 19, 2019
c9c73f5
Refer to `add` method instead of `offset`
phil-opp Jul 17, 2019
3dca17e
Disallow duplicate lifetime parameters with legacy hygiene
matthewjasper Jul 28, 2019
8876b3b
Resolve const parameters with modern hygiene
matthewjasper Jul 28, 2019
dfad725
Recover 'for ( $pat in $expr ) $block'.
Centril Jul 24, 2019
1b11860
Use chaining for diagnosics in parser.
Centril Jul 24, 2019
56b39fb
Add 'span_to_snippet' shortcut.
Centril Jul 24, 2019
18bf9dd
Properly check the defining scope of existential types
Aaron1011 Jul 28, 2019
8811b9c
Fix formatting
Aaron1011 Jul 28, 2019
3e98c3a
Rename test and add comment
Aaron1011 Jul 28, 2019
e2ee2a3
Move ui/{existential-type -> existential_types}.
Centril Jul 29, 2019
b2a5d99
Move ui/existential_type.rs -> ui/existential_type/existential_type-p…
Centril Jul 29, 2019
b779f45
Add test for #53678.
Centril Jul 29, 2019
1e927d8
Add test for #60407.
Centril Jul 29, 2019
a54dd23
Add test for #60564.
Centril Jul 29, 2019
0cdd693
vxworks: Remove Linux-specific comments.
josephlr Jul 29, 2019
60680d4
ci: Skip installing SWIG/xz on OSX
alexcrichton Jul 29, 2019
c56d8a8
Add links to None in Option doc
tesuji Jul 29, 2019
624c5da
impl Debug for Chars
max-sixty Jul 26, 2019
3325ff6
comments from @lzutao
max-sixty Jul 29, 2019
8d7fb87
std: Fix a failing `fs` test on Windows
alexcrichton Jul 29, 2019
870efe3
Add very simple edition check to tidy; and add missing edition = 2018s.
crlf0710 Jul 28, 2019
15bc63e
Add syntactic test for rest patterns.
Centril Jul 29, 2019
0fb9295
Add another test for const parameter (non) hygiene.
matthewjasper Jul 29, 2019
6c7613b
Add semantic test for rest patterns.
Centril Jul 29, 2019
b5bea25
Rollup merge of #61965 - phil-opp:patch-4, r=scottmcm
Centril Jul 30, 2019
3602987
Rollup merge of #62928 - Centril:recover-parens-around-for-head, r=es…
Centril Jul 30, 2019
51e50ed
Rollup merge of #63000 - max-sixty:chars-display, r=alexcrichton
Centril Jul 30, 2019
652f13d
Rollup merge of #63083 - matthewjasper:parameter-hygiene, r=petrochenkov
Centril Jul 30, 2019
4413068
Rollup merge of #63087 - crlf0710:tidy_2018, r=Mark-Simulacrum
Centril Jul 30, 2019
f3750e3
Rollup merge of #63093 - Aaron1011:fix/existential-closure, r=cramertj
Centril Jul 30, 2019
09eb0b1
Rollup merge of #63096 - Centril:existential-type-add-tests, r=varkor
Centril Jul 30, 2019
cc4a8d7
Rollup merge of #63099 - josephlr:vxworks, r=alexcrichton
Centril Jul 30, 2019
3ef6f6d
Rollup merge of #63106 - alexcrichton:remove-swig-osx, r=pietroalbini
Centril Jul 30, 2019
a03caec
Rollup merge of #63108 - lzutao:option-xor-typo, r=jonas-schievink
Centril Jul 30, 2019
2becb62
Rollup merge of #63109 - alexcrichton:disable-windows-fs-test, r=sfac…
Centril Jul 30, 2019
91c10f8
Rollup merge of #63111 - Centril:rest-pat-tests, r=estebank
Centril Jul 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
std: Fix a failing fs test on Windows
In testing 4-core machines on Azure the `realpath_works_tricky` test in
the standard library is failing with "The directory name is invalid". In
attempting to debug this test I was able to reproduce the failure
locally on my machine, and after inspecing the test it I believe is
exploiting Unix-specific behavior that seems to only sometimes work on
Windows. Specifically the test basically executes:

    mkdir -p a/b
    mkdir -p a/d
    touch a/f
    ln -s a/b/c ../d/e
    ln -s a/d/e ../f

and then asserts that `canonicalize("a/b/c")` and
`canonicalize("a/d/e")` are equivalent to `a/f`. On Windows however the
first symlink is a "directory symlink" and the second is a file symlink.
In both cases, though, they're pointing to files. This means that for
whatever reason locally and on the 4-core environment the call to
`canonicalize` is failing. On Azure today it seems to be passing, and
I'm not entirely sure why. I'm sort of presuming that there's some sort
of internals going on here where there's some global Windows setting
which makes symlinks behavior more unix-like and ignore the directory
hint.

In any case this should keep the test working and also fixes the test
locally for me.
  • Loading branch information
alexcrichton committed Jul 29, 2019
commit 8d7fb87e6521c39af2e4fca11c61ab2eb765df82
4 changes: 2 additions & 2 deletions src/libstd/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3316,11 +3316,11 @@ mod tests {
fs::create_dir_all(&d).unwrap();
File::create(&f).unwrap();
if cfg!(not(windows)) {
symlink_dir("../d/e", &c).unwrap();
symlink_file("../d/e", &c).unwrap();
symlink_file("../f", &e).unwrap();
}
if cfg!(windows) {
symlink_dir(r"..\d\e", &c).unwrap();
symlink_file(r"..\d\e", &c).unwrap();
symlink_file(r"..\f", &e).unwrap();
}

Expand Down