Skip to content

Commit a4574bd

Browse files
committed
Auto merge of #31855 - alexcrichton:fix-tidy, r=nikomatsakis
The MinGW-based Python implementations would automatically do this, but if we want to use Python from the official downloads our usage of `/` instead of `\` can wreak havoc. In a few select locations just use `os.path.normpath` do do the conversions properly for us.
2 parents 281f9d8 + 622ec5d commit a4574bd

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/etc/licenseck.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# except according to those terms.
1010

1111
import re
12+
import os
1213

1314
license_re = re.compile(
1415
u"""(#|//) Copyright .* The Rust Project Developers. See the COPYRIGHT
@@ -40,8 +41,9 @@
4041
]
4142

4243
def check_license(name, contents):
44+
name = os.path.normpath(name)
4345
# Whitelist check
44-
if any(name.endswith(e) for e in exceptions):
46+
if any(name.endswith(os.path.normpath(e)) for e in exceptions):
4547
return True
4648

4749
# Xfail check

src/etc/tidy.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ def interesting_file(f):
122122
'src/liblibc',
123123
}
124124

125-
if any(d in dirpath for d in skippable_dirs):
125+
dirpath = os.path.normpath(dirpath)
126+
if any(os.path.normpath(d) in dirpath for d in skippable_dirs):
126127
continue
127128

128129
file_names = [os.path.join(dirpath, f) for f in filenames

0 commit comments

Comments
 (0)