Skip to content

Rollup of 8 pull requests #110170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 17 commits into from
Apr 11, 2023
Merged

Rollup of 8 pull requests #110170

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8dd0ec6
Set up standard library path substitution in rust-gdb and gdbgui
lnicola Mar 23, 2023
48be303
Add riscv relax target feature
zyedidia Apr 2, 2023
87b3ae3
Make "unneccesary visibility qualifier" error much more clear
ElectrifyPro Apr 4, 2023
4e5c120
Update ui tests involving invalid visibility qualifiers
ElectrifyPro Apr 4, 2023
ed0b8af
The `wrapping_neg` example for unsigned types shouldn't use `i8`
scottmcm Apr 8, 2023
271ac7b
Add regression test for #104916
JohnTitor Apr 10, 2023
c127020
fix(doc): do not parse inline when output is json for external crate
bvanjoi Apr 10, 2023
8d2dbba
Stall auto-trait assembly for int/float vars in new solver
compiler-errors Apr 3, 2023
687abb0
Update books
rustbot Apr 10, 2023
c617ddf
Rollup merge of #109527 - lnicola:rust-gdb-substitute-path, r=cuviper
JohnTitor Apr 11, 2023
a69cc45
Rollup merge of #109752 - compiler-errors:new-solver-stall-auto-trait…
JohnTitor Apr 11, 2023
5af6385
Rollup merge of #109860 - zyedidia:riscv-relax, r=petrochenkov
JohnTitor Apr 11, 2023
788de47
Rollup merge of #109923 - ElectrifyPro:visibility, r=wesleywiser
JohnTitor Apr 11, 2023
75a4625
Rollup merge of #110070 - scottmcm:wrapping-neg, r=cuviper
JohnTitor Apr 11, 2023
a996418
Rollup merge of #110146 - bvanjoi:relative-110138, r=notriddle
JohnTitor Apr 11, 2023
016ebf8
Rollup merge of #110147 - JohnTitor:issue-104916, r=compiler-errors
JohnTitor Apr 11, 2023
48e14bb
Rollup merge of #110149 - rustbot:docs-update, r=ehuss
JohnTitor Apr 11, 2023
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
4 changes: 4 additions & 0 deletions src/etc/rust-gdb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ fi
# Find out where the pretty printer Python module is
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
# Get the commit hash for path remapping
RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \(\w*\)/\1/p')"

# Run GDB with the additional arguments that load the pretty printers
# Set the environment variable `RUST_GDB` to overwrite the call to a
Expand All @@ -21,4 +23,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
--directory="$GDB_PYTHON_MODULE_DIRECTORY" \
-iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
-iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
"$@"

6 changes: 5 additions & 1 deletion src/etc/rust-gdbgui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ fi
# Find out where the pretty printer Python module is
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
# Get the commit hash for path remapping
RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \(\w*\)/\1/p')"

# Set the environment variable `RUST_GDB` to overwrite the call to a
# different/specific command (defaults to `gdb`).
Expand All @@ -53,7 +55,9 @@ RUST_GDBGUI="${RUST_GDBGUI:-gdbgui}"

# These arguments get passed through to GDB and make it load the
# Rust pretty printers.
GDB_ARGS="--directory=\"$GDB_PYTHON_MODULE_DIRECTORY\" -iex \"add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY\""
GDB_ARGS="--directory=\"$GDB_PYTHON_MODULE_DIRECTORY\"" \
"-iex \"add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY\"" \
"-iex \"set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust\""

# Finally we execute gdbgui.
PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" \
Expand Down