remove tracing tree indent lines #125378

lcnr · 2024-05-21T18:27:10Z

This allows vscode to collapse nested spans without having to manually remove the indent lines. This is incredibly useful when logging the new solver. I don't mind making them optional depending on some environment flag if you prefer using indent lines

For a gist of the new output, see https://gist.github.com/lcnr/bb4360ddbc5cd4631f2fbc569057e5eb#file-example-output-L181

r? @oli-obk

rustbot · 2024-05-21T18:27:21Z

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in exhaustiveness checking

cc @Nadrieril

oli-obk · 2024-05-22T04:45:19Z

yea, I'm fixing this on the tracing-tree side, too, but let's go with just disabling them for now

@bors r+ rollup

bors · 2024-05-22T04:45:22Z

📌 Commit 1005cc7 has been approved by oli-obk

It is now in the queue for this repository.

remove tracing tree indent lines This allows vscode to collapse nested spans without having to manually remove the indent lines. This is incredibly useful when logging the new solver. I don't mind making them optional depending on some environment flag if you prefer using indent lines For a gist of the new output, see https://gist.github.com/lcnr/bb4360ddbc5cd4631f2fbc569057e5eb#file-example-output-L181 r? `@oli-obk`

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#124227 (Make sure that the method resolution matches in `note_source_of_type_mismatch_constraint`) - rust-lang#124896 (miri: rename intrinsic_fallback_checks_ub to intrinsic_fallback_is_spec) - rust-lang#125015 (Pattern types: Prohibit generic args on const params) - rust-lang#125043 (reference type safety invariant docs: clarification) - rust-lang#125259 (An async closure may implement `FnMut`/`Fn` if it has no self-borrows) - rust-lang#125306 (Force the inner coroutine of an async closure to `move` if the outer closure is `move` and `FnOnce`) - rust-lang#125378 (remove tracing tree indent lines) r? `@ghost` `@rustbot` modify labels: rollup

remove tracing tree indent lines This allows vscode to collapse nested spans without having to manually remove the indent lines. This is incredibly useful when logging the new solver. I don't mind making them optional depending on some environment flag if you prefer using indent lines For a gist of the new output, see https://gist.github.com/lcnr/bb4360ddbc5cd4631f2fbc569057e5eb#file-example-output-L181 r? ``@oli-obk``

Rollup of 7 pull requests Successful merges: - rust-lang#125043 (reference type safety invariant docs: clarification) - rust-lang#125306 (Force the inner coroutine of an async closure to `move` if the outer closure is `move` and `FnOnce`) - rust-lang#125355 (Use Backtrace::force_capture instead of Backtrace::capture in rustc_log) - rust-lang#125378 (remove tracing tree indent lines) - rust-lang#125391 (Minor serialize/span tweaks) - rust-lang#125395 (Remove unnecessary `.md` from the documentation sidebar) - rust-lang#125399 (Stop using `to_hir_binop` in codegen) r? `@ghost` `@rustbot` modify labels: rollup

fmease · 2024-05-22T21:40:05Z

Hey, hey :)

Unfortunately, we've got some rmake test failures: #125393 (comment) (and its dupe: #125414 (comment)).
This is due to the fact that the tests/run-make/rust-lld{,-by-default,-custom-target}/rmake.rs test runners parse the info-level tracing output to obtain the version of the LLD linker. The regexes inside the 3 find_lld_version_in_logs fns need to be updated to account for the indent I presume.

@bors r-

rustbot · 2024-05-24T15:46:54Z

Some changes occurred in run-make tests.

cc @jieyouxu

lcnr · 2024-05-24T15:52:28Z

I couldn't test these changes locally on the dev desktop, but I think that this should fix it

@bors rollup=never

tests/run-make/rust-lld/rmake.rs

compiler-errors · 2024-05-24T17:47:04Z

@bors r+

bors · 2024-05-24T17:47:07Z

📌 Commit f0c38d5 has been approved by compiler-errors

It is now in the queue for this repository.

…rors remove tracing tree indent lines This allows vscode to collapse nested spans without having to manually remove the indent lines. This is incredibly useful when logging the new solver. I don't mind making them optional depending on some environment flag if you prefer using indent lines For a gist of the new output, see https://gist.github.com/lcnr/bb4360ddbc5cd4631f2fbc569057e5eb#file-example-output-L181 r? `@oli-obk`

lcnr · 2024-05-24T18:15:09Z

@bors retry

bors · 2024-05-25T00:05:07Z

⌛ Testing commit f0c38d5 with merge 9372cd2...

…rors remove tracing tree indent lines This allows vscode to collapse nested spans without having to manually remove the indent lines. This is incredibly useful when logging the new solver. I don't mind making them optional depending on some environment flag if you prefer using indent lines For a gist of the new output, see https://gist.github.com/lcnr/bb4360ddbc5cd4631f2fbc569057e5eb#file-example-output-L181 r? `@oli-obk`

bors · 2024-05-25T01:12:21Z

💔 Test failed - checks-actions

lqd · 2024-05-25T07:01:04Z

tests/run-make/rust-lld-by-default/rmake.rs

    let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
    let stderr = std::str::from_utf8(&output.stderr).unwrap();
-    stderr.lines().any(|line| lld_version_re.is_match(line))
+    stderr.lines().any(|line| lld_version_re.is_match(line.trim_whitespace()))


Suggested change

stderr.lines().any(|line| lld_version_re.is_match(line.trim_whitespace()))

stderr.lines().any(|line| lld_version_re.is_match(line.trim()))

jieyouxu · 2024-05-26T22:04:00Z

@bors r- (manually r- because the tree looks wonky with some PRs that shouldn't be elligble for rollup)

lcnr · 2024-05-30T16:18:26Z

@bors r=oli-obk rollup=never

bors · 2024-05-30T16:18:28Z

📌 Commit 8160974 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2024-05-30T18:57:52Z

⌛ Testing commit 8160974 with merge 6f3df08...

bors · 2024-05-30T21:06:33Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 6f3df08 to master...

rust-timer · 2024-05-30T22:22:03Z

Finished benchmarking commit (6f3df08): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -4.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-4.3%	[-4.3%, -4.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-4.3%	[-4.3%, -4.3%]	1

Cycles

Results (secondary -2.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 670.972s -> 670.547s (-0.06%)
Artifact size: 318.73 MiB -> 318.70 MiB (-0.01%)

rustbot assigned oli-obk May 21, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2024

matthiaskrgr mentioned this pull request May 22, 2024

Rollup of 7 pull requests #125393

Closed

fmease mentioned this pull request May 22, 2024

Rollup of 7 pull requests #125414

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 22, 2024

rust-cloud-vms bot force-pushed the tracing-no-lines branch from 1005cc7 to f18cb8a Compare May 24, 2024 15:46

lcnr commented May 24, 2024

View reviewed changes

tests/run-make/rust-lld/rmake.rs Outdated Show resolved Hide resolved

rust-cloud-vms bot force-pushed the tracing-no-lines branch from db9bf14 to f0c38d5 Compare May 24, 2024 15:59

compiler-errors approved these changes May 24, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2024

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 24, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 24, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 25, 2024

lqd reviewed May 25, 2024

View reviewed changes

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 26, 2024

lcnr added 5 commits May 30, 2024 15:26

remove tracing tree indent lines

97d2c3a

update UI tests

f7d14b7

add logging to search graph

86cbabb

add info to rust-ldd tests failures

aa8f995

ignore whitespace in ldd tests

8160974

lcnr force-pushed the tracing-no-lines branch from f0c38d5 to 8160974 Compare May 30, 2024 13:28

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 30, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label May 30, 2024

bors merged commit 6f3df08 into rust-lang:master May 30, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone May 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove tracing tree indent lines #125378

remove tracing tree indent lines #125378

lcnr commented May 21, 2024

rustbot commented May 21, 2024

oli-obk commented May 22, 2024

bors commented May 22, 2024

fmease commented May 22, 2024 •

edited

Loading

rustbot commented May 24, 2024

lcnr commented May 24, 2024

compiler-errors commented May 24, 2024

bors commented May 24, 2024

lcnr commented May 24, 2024

bors commented May 25, 2024

This comment has been minimized.

bors commented May 25, 2024

lqd May 25, 2024

lcnr May 30, 2024

jieyouxu commented May 26, 2024

lcnr commented May 30, 2024

bors commented May 30, 2024

bors commented May 30, 2024

bors commented May 30, 2024

rust-timer commented May 30, 2024

	stderr.lines().any(\|line\| lld_version_re.is_match(line.trim_whitespace()))
	stderr.lines().any(\|line\| lld_version_re.is_match(line.trim()))

remove tracing tree indent lines #125378

remove tracing tree indent lines #125378

Conversation

lcnr commented May 21, 2024

rustbot commented May 21, 2024

oli-obk commented May 22, 2024

bors commented May 22, 2024

fmease commented May 22, 2024 • edited Loading

rustbot commented May 24, 2024

lcnr commented May 24, 2024

compiler-errors commented May 24, 2024

bors commented May 24, 2024

lcnr commented May 24, 2024

bors commented May 25, 2024

This comment has been minimized.

bors commented May 25, 2024

lqd May 25, 2024

Choose a reason for hiding this comment

lcnr May 30, 2024

Choose a reason for hiding this comment

jieyouxu commented May 26, 2024

lcnr commented May 30, 2024

bors commented May 30, 2024

bors commented May 30, 2024

bors commented May 30, 2024

rust-timer commented May 30, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

fmease commented May 22, 2024 •

edited

Loading