Skip to content

Rollup of 7 pull requests #139054

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.

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
merged 30 commits into from
Mar 28, 2025
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4508f5f
update outdated doc with new example
mu001999 Mar 2, 2025
795a666
rustc_resolve: fix instability in lib.rmeta contents
durin42 Mar 18, 2025
1f1c630
Greatly simplify doctest parsing and information extraction
GuillaumeGomez Mar 5, 2025
01fb7c3
Update rustdoc-ui tests
GuillaumeGomez Mar 6, 2025
6f7e8d4
Correctly handle `fn main` in macro
GuillaumeGomez Mar 7, 2025
123ea25
Correctly handle line comments in attributes and generate extern crates
GuillaumeGomez Mar 7, 2025
be13105
Improve comment and test for generated doctest with code comments
GuillaumeGomez Mar 27, 2025
f333ad8
Improve code comment
GuillaumeGomez Mar 27, 2025
8327bb6
Add `expect` to the list of non-crate attributes for doctest generation
GuillaumeGomez Mar 27, 2025
2004dac
Improve code
GuillaumeGomez Mar 27, 2025
1494da4
Add new regression test for doctest
GuillaumeGomez Mar 27, 2025
49f1e9c
Remove recursion in `check_item`
GuillaumeGomez Mar 27, 2025
77eb97d
librustdoc: also stabilize iteration order here
durin42 Mar 27, 2025
eaa0613
feat(config): Add ChangeId enum for suppressing warnings
Shourya742 Mar 26, 2025
0244432
add changeInfo to change tracker
Shourya742 Mar 26, 2025
1437dec
rustc_resolve: prevent iteration of refids for completeness
durin42 Mar 27, 2025
5d27440
Only take outer attributes into account when generating content betwe…
GuillaumeGomez Mar 27, 2025
3b7d59a
Update target maintainers for thumb targets to reflect new REWG Arm t…
adamgreig Mar 28, 2025
b24083b
Add new change-id option in bootstrap.example.toml and update the cha…
Shourya742 Mar 27, 2025
d5f7e71
bootstrap: update `test_find` test
onur-ozkan Mar 28, 2025
3a9a577
Remove ScopeDepth entirely.
m-ou-se Mar 28, 2025
deeac1c
Remove outdated comment.
m-ou-se Mar 28, 2025
87d524b
Update `coverage-run-rustdoc` output
GuillaumeGomez Mar 28, 2025
9597bf7
Rollup merge of #137889 - mu001999-contrib:update-doc, r=wesleywiser
matthiaskrgr Mar 28, 2025
ad87732
Rollup merge of #138104 - GuillaumeGomez:simplify-doctest-parsing, r=…
matthiaskrgr Mar 28, 2025
bdc5adf
Rollup merge of #138678 - durin42:rmeta-stability, r=fmease
matthiaskrgr Mar 28, 2025
60833b1
Rollup merge of #138986 - Shourya742:2025-03-25-add-ignore-to-change-…
matthiaskrgr Mar 28, 2025
5261a0a
Rollup merge of #139038 - adamgreig:thumb-target-maintainers, r=Norat…
matthiaskrgr Mar 28, 2025
ea56904
Rollup merge of #139045 - onur-ozkan:less-verbose-bootstrap-test, r=K…
matthiaskrgr Mar 28, 2025
310bebc
Rollup merge of #139047 - m-ou-se:remove-scope-depth, r=oli-obk
matthiaskrgr Mar 28, 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
Prev Previous commit
Next Next commit
Improve code comment
  • Loading branch information
GuillaumeGomez committed Mar 27, 2025
commit f333ad8656af7a43559805a9a321da8cf618d0c1
4 changes: 2 additions & 2 deletions src/librustdoc/doctest/make.rs
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ fn parse_source(source: &str, crate_name: &Option<&str>) -> Result<ParseSourceIn
prev_span_hi: &mut Option<usize>,
) {
let extra_len = DOCTEST_CODE_WRAPPER.len();
// We need to shift by 1 because we added `{` at the beginning of the source.we provided
// to the parser.
// We need to shift by the length of `DOCTEST_CODE_WRAPPER` because we
// added it at the beginning of the source we provided to the parser.
let lo = prev_span_hi.unwrap_or(0);
let mut hi = span.hi().0 as usize - extra_len;
if hi > source.len() {
Expand Down