Skip to content

beta: revert #8640 - rustdoc versioning checks#9332

Merged
bors merged 3 commits intorust-lang:rust-1.52.0from
ehuss:beta-revert-rustdoc
Apr 6, 2021
Merged

beta: revert #8640 - rustdoc versioning checks#9332
bors merged 3 commits intorust-lang:rust-1.52.0from
ehuss:beta-revert-rustdoc

Conversation

@ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 6, 2021 •
edited
Loading

#8640 has been causing some problems with rustbuild (see rust-lang/rust#83914 and rust-lang/rust#83530 (comment)). In order to give more time to figure out a solution, this reverts the change on beta. Will need to take some time to figure out what to do on master.

Also cherry picked the following to get tests passing:

@ehuss
beta: revert rust-lang#8640 - rustdoc versioning checks
de983c9 
This reverts commit 8fa0827, reversing
changes made to b842849.

# Conflicts:
#	src/cargo/core/compiler/build_context/target_info.rs
#	tests/testsuite/doc.rs
@rust-highfive
Copy link

rust-highfive commented Apr 6, 2021

r? @alexcrichton

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link

rust-highfive commented Apr 6, 2021

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.52.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 6, 2021
@ehuss ehuss mentioned this pull request Apr 6, 2021
Closed
@ehuss
Copy link
Contributor Author

ehuss commented Apr 6, 2021

cc @CPerezz FYI.

bors added 2 commits April 5, 2021 21:14
@bors @ehuss
Auto merge of rust-lang#9316 - ehuss:fix-semver-1.51, r=alexcrichton
e668552 
Fix semver docs for 1.51.

1.51 slightly changed the text of a few error messages. This should get CI passing again.
@bors @ehuss
Auto merge of rust-lang#9307 - ijackson:exit-code-string, r=joshtriplett
6ce927a 
tests: Tolerate "exit status" in error messages

"exit code" is wrong terminology on Unix.  I am trying to fix this in Rust stdlib in rust-lang/rust#83462 but this currently breaks the cargo test suite.

See that MR for full explanation of the change.
@CPerezz
Copy link
Contributor

CPerezz commented Apr 6, 2021

Thanks for the ping @ehuss. It's pretty unfortunate.. Anything I can help on?

@jyn514
Copy link
Member

jyn514 commented Apr 6, 2021 •
edited
Loading

@CPerezz a less invasive version of #8640 would be to use --resource-suffix by the toolchain instead: #8461 (comment)

@ehuss
Copy link
Contributor Author

ehuss commented Apr 6, 2021

I'm concerned that --resource-suffix may have its own issues. It would cause resource files to accumulate in the doc directory with a myriad of different suffixes. It would also mean that when different packages are documented with different versions, they won't know about each other (like the search indexes will be wrong on one side or the other). I'm also uncertain how that works with crates.js, which would mean the crates listings could be out of sync.

None of those are deal breakers on their own, but I'd like to consider other options if possible.

@alexcrichton
Copy link
Member

alexcrichton commented Apr 6, 2021

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 6, 2021

📌 Commit 6ce927a has been approved by alexcrichton

@bors 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 Apr 6, 2021
@bors
Copy link
Contributor

bors commented Apr 6, 2021

⌛ Testing commit 6ce927a with merge d70308e...

@bors
Copy link
Contributor

bors commented Apr 6, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing d70308e to rust-1.52.0...

@bors bors merged commit d70308e into rust-lang:rust-1.52.0 Apr 6, 2021
@ehuss ehuss mentioned this pull request Apr 6, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2021
@bors
Auto merge of rust-lang#83946 - ehuss:update-beta-cargo, r=ehuss
2157381 
[beta] Update cargo

2 commits in 90691f2bfe9a50291a98983b1ed2feab51d5ca55..d70308ef052397c7d16f881c2d973a8c5b4c23d9
2021-03-16 21:36:55 +0000 to 2021-04-06 17:32:27 +0000
- beta: revert rust-lang/cargo#8640 - rustdoc versioning checks (rust-lang/cargo#9332)
- [beta] Fix publication of packages with metadata and resolver (rust-lang/cargo#9304)
@ehuss ehuss added this to the 1.52.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.52.0

Development

Successfully merging this pull request may close these issues.

6 participants

@ehuss @rust-highfive @CPerezz @jyn514 @alexcrichton @bors