Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 799a75e

Browse files
committedMar 3, 2025
Auto merge of rust-lang#137903 - matthiaskrgr:rollup-ywmhfu6, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - rust-lang#137103 ({json|html}docck: catch and error on deprecated syntax) - rust-lang#137632 (rustdoc: when merging target features, keep the highest stability) - rust-lang#137684 (Add rustdoc support for `--emit=dep-info[=path]`) - rust-lang#137794 (make qnx pass a test) - rust-lang#137801 (tests: Unignore target modifier tests on all platforms) - rust-lang#137826 (test(codegen): add looping_over_ne_bytes test for rust-lang#133528) r? `@ghost` `@rustbot` modify labels: rollup
2 parents daf5985 + eac4731 commit 799a75e

File tree

93 files changed

+408
-328
lines changed

Some content is hidden

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

93 files changed

+408
-328
lines changed
 

‎tests/run-make/rustdoc-default-output/output-default.stdout

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Options:
153153
--generate-redirect-map
154154
Generate JSON file at the top level instead of
155155
generating HTML redirection files
156-
--emit [unversioned-shared-resources,toolchain-shared-resources,invocation-specific]
156+
--emit [unversioned-shared-resources,toolchain-shared-resources,invocation-specific,dep-info]
157157
Comma separated list of types of output for rustdoc to
158158
emit
159159
--no-run Compile doctests without running them
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include!("foo.rs");
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blablabla
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub fn foo() {}
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.