Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1cac5fa
Look for `python3` first on MacOS, not `py`
jyn514 Feb 13, 2025
477a2ee
std::fs: slightly reformat `remove_dir_all` error docs
jieyouxu Feb 18, 2025
2bead27
remove : from stack-protector-heuristics-effect.rs filecheck
mustartt Feb 12, 2025
2c752bc
Undeprecate env::home_dir
arlosi Feb 20, 2025
fb8c993
fix label suffix
mustartt Feb 20, 2025
bf26f24
Clarify/update comments in `BufRead::read_line`'s default body
steffahn Feb 20, 2025
762fdf6
default to `-znostart-stop-gc`
lqd Feb 26, 2025
1528cc2
`librustdoc`: 2024 edition! 🎊
yotamofek Feb 27, 2025
7d263b0
Adapt `librustdoc` to 2024 edition lifetieme capture rules
yotamofek Feb 27, 2025
396c2a8
Stop using `hash_raw_entry` in `CodegenCx::const_str`
cuviper Feb 27, 2025
ea13ff7
add exclude to config.toml
Shourya742 Feb 16, 2025
d9ceab9
add test for exclude feature
Shourya742 Feb 16, 2025
9206960
Add change info to change tracker
Shourya742 Feb 16, 2025
7603e01
Simplify parallelization in test-float-parse
tgross35 Dec 31, 2024
3d0c89b
Rollup merge of #136938 - mustartt:fix-stack-protector-filecheck, r=M…
tgross35 Mar 2, 2025
0d0344c
Rollup merge of #136975 - jyn514:macos-x, r=Mark-Simulacrum
tgross35 Mar 2, 2025
f616b76
Rollup merge of #137147 - Shourya742:2025-02-16-support-exclude-in-co…
tgross35 Mar 2, 2025
e18fd2e
Rollup merge of #137240 - jieyouxu:remove_dir_all, r=Mark-Simulacrum
tgross35 Mar 2, 2025
f7d4e63
Rollup merge of #137327 - arlosi:home-dir, r=Mark-Simulacrum
tgross35 Mar 2, 2025
fd50842
Rollup merge of #137375 - steffahn:clarify-read_line-comment, r=Mark-…
tgross35 Mar 2, 2025
0386e93
Rollup merge of #137525 - tgross35:test-float-parse-less-parallelizat…
tgross35 Mar 2, 2025
e459ff0
Rollup merge of #137685 - lqd:nostart-stop-gc, r=petrochenkov
tgross35 Mar 2, 2025
b53fa79
Rollup merge of #137722 - yotamofek:pr/rustdoc/edition-2024, r=notriddle
tgross35 Mar 2, 2025
dedafdf
Rollup merge of #137741 - cuviper:const_str-raw_entry, r=Mark-Simulacrum
tgross35 Mar 2, 2025
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
Next Next commit
Look for python3 first on MacOS, not py
`py` is not installed by default *and* trying to run it results in a
popup asking if you want to install it. `python3` is installed by
default.

This hopefully should not be too disruptive to people on Windows, since
they should be going through `x.ps1` instead anyway. Just in case, I've
added a check for Cygwin and Msys (i'm not sure how else you'd get a
bash shell on windows).
  • Loading branch information
jyn514 committed Feb 13, 2025
commit 1cac5fa5f9f371db4789ea928e1d2769d4cd921b
8 changes: 7 additions & 1 deletion x
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ xpy=$(dirname "$(realpath "$0")")/x.py

# On Windows, `py -3` sometimes works. We need to try it first because `python3`
# sometimes tries to launch the app store on Windows.
for SEARCH_PYTHON in py python3 python python2; do
# On MacOS, `py` tries to install "Developer command line tools". Try `python3` first.
# NOTE: running `bash -c ./x` from Windows doesn't set OSTYPE.
case ${OSTYPE:-} in
cygwin*|msys*) SEARCH="py python3 python python2";;
*) SEARCH="python3 python py python2";;
esac
for SEARCH_PYTHON in $SEARCH; do
if python=$(command -v $SEARCH_PYTHON) && [ -x "$python" ]; then
if [ $SEARCH_PYTHON = py ]; then
extra_arg="-3"
Expand Down
Loading