Skip to content

Commit a6b3aaa

Browse files
committed
Auto merge of #161638 - Zalathar:rollup-oG1YjFs, r=Zalathar
Rollup of 22 pull requests Successful merges: - rust-lang/rust#161586 (miri subtree update) - rust-lang/rust#161187 (add `Complex<T>` layout tests for straightforward targets) - rust-lang/rust#161524 (Put back `tests/rustdoc-gui/search-result-display.goml`) - rust-lang/rust#161592 (core: refactor tests/pattern.rs tests) - rust-lang/rust#161602 (Fix flakyness issue for `tests/rustdoc-gui/headers-color.goml`) - rust-lang/rust#152433 (Use `symlink_dir` to create junctions on Windows instead of trying to use symbolic links in `copy_link_internal`) - rust-lang/rust#155254 (Recover on attribute in use tree) - rust-lang/rust#158695 (Replace `CrateDump` with the Debug impl from `CStore`) - rust-lang/rust#159456 (Fix the reporting of layout normalization failures in transmute checks) - rust-lang/rust#159940 (Eliminate some buggy `unreachable!()`s in `expand_[option_]env()`) - rust-lang/rust#160452 (-Ctarget-feature is not unsafe (any more)) - rust-lang/rust#161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios") - rust-lang/rust#161552 (also trigger overflow FCW when going from overflow -> error) - rust-lang/rust#161569 (Bump cfg_aliases to 0.2.2) - rust-lang/rust#161573 (re-bless `pretty-std` on windows) - rust-lang/rust#161580 (Add codegen test for redundant bit mask after a range check) - rust-lang/rust#161588 (update eyre) - rust-lang/rust#161589 (std: reduce visibility of some internal OsStr related types) - rust-lang/rust#161598 ([Bootstrap] Pass exact CI `llvm-config` executable path) - rust-lang/rust#161601 (Path: use optimized is_empty() method) - rust-lang/rust#161604 (coretests: Add a few tests for backward multibyte predicate) - rust-lang/rust#161615 (interpret: make validate_c_variadic_compatible_ty public)
2 parents 3c152ff + 22578e8 commit a6b3aaa

104 files changed

Lines changed: 1761 additions & 646 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ case $HOST_TARGET in
168168
MANY_SEEDS=16 TEST_TARGET=x86_64-unknown-freebsd run_tests
169169
MANY_SEEDS=16 TEST_TARGET=i686-unknown-freebsd run_tests
170170
MANY_SEEDS=16 TEST_TARGET=x86_64-unknown-illumos run_tests
171-
MANY_SEEDS=16 TEST_TARGET=x86_64-unknown-netbsd run_tests_minimal hello
171+
MANY_SEEDS=16 TEST_TARGET=x86_64-unknown-netbsd run_tests_minimal hello libc-env libc-misc
172172
;;
173173
armv7-unknown-linux-gnueabihf)
174174
# Host

miri-script/src/commands.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl MiriEnv {
5555
.cargo_cmd("cargo-miri", "run", &[])
5656
.arg("--quiet")
5757
.arg("--")
58-
.args(&["miri", "setup", "--print-sysroot"])
58+
.args(["miri", "setup", "--print-sysroot"])
5959
.args(target_flag);
6060
if quiet {
6161
cmd = cmd.arg("--quiet");
@@ -511,7 +511,7 @@ impl Command {
511511
// We invoke the test suite as that has all the logic for running with dependencies.
512512
let mut cmd = e
513513
.cargo_cmd(".", "test", &features)
514-
.args(&["--test", "ui"])
514+
.args(["--test", "ui"])
515515
// This does not show anything useful so we always hide it.
516516
.arg("--quiet")
517517
.arg("--")

miri-script/src/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl MiriEnv {
178178
// parallelism in `./miri test` as we build Miri and its tests together.
179179
let mut cmd = self
180180
.cargo_cmd(crate_dir, "build", features)
181-
.args(&["--all-targets"])
181+
.args(["--all-targets"])
182182
.args(quiet_flag)
183183
.args(args);
184184
cmd.set_quiet(quiet);
@@ -194,7 +194,7 @@ impl MiriEnv {
194194
) -> Result<PathBuf> {
195195
let cmd = self
196196
.cargo_cmd(crate_dir, "build", features)
197-
.args(&["--all-targets", "--message-format=json"]);
197+
.args(["--all-targets", "--message-format=json"]);
198198
let output = cmd.output()?;
199199
let mut bin = None;
200200
for line in output.stdout.lines() {

priroda/README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,13 @@ user-relevant source location after `configurationDone`, reports one current
4747
stack frame, exposes one flat Locals scope, and maps `list_locals()` into DAP
4848
variables with no child expansion.
4949

50-
The `next` and `stepIn` requests are wired to Priroda's existing source-line
51-
step so VS Code can drive one visible step. They are not true DAP step-over or
52-
step-in semantics yet.
50+
DAP supports `stepIn`, `next`, and `stepOut`. `stepIn` stops at the next
51+
displayed source location and can enter calls when the callee has a distinct
52+
displayed source position. `next` steps over calls by tracking the starting stack
53+
depth, and `stepOut` runs until execution reaches a shallower user frame.
54+
`stepOut` from the outermost user frame is rejected. This is still
55+
single-threaded and source-position based, not the full future thread/frame
56+
model.
5357

5458
### VS Code
5559

@@ -152,7 +156,9 @@ RUSTC_BLESS=1 cargo test
152156
| Command | Description |
153157
|---|---|
154158
| Enter, `si`, `stepi` | Execute one Miri interpreter step. |
155-
| `s`, `step` | Step until the displayed source location changes. |
159+
| `s`, `step` | Step to the next displayed source location, entering calls with their own displayed position. |
160+
| `n`, `next` | Step over the current displayed source location. |
161+
| `out`, `stepout` | Run until execution returns to a shallower user frame. |
156162
| `c`, `continue` | Continue until the program finishes or reaches a breakpoint. |
157163
| `b <path>:<line>`, `break <path>:<line>` | Add a source-location breakpoint. |
158164
| `l`, `locals` | List source-level locals in the current frame by name. |

0 commit comments

Comments
 (0)