Skip to content

Remove the original changelog #15123

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 1 commit into from
Feb 3, 2025
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jan 29, 2025

This removes the original changelog now that it is located in the cargo book.

This places a notice in the original location that it has moved to a new place. There are a few other alternatives we could consider:

  • Keep the headings but replace the content with a link. This would make it a little easier for someone to jump to the exact position in the new page. However, it looks a little messy. Each section could be something like:

    This content has moved to CHANGELOG.md#186-2025-04-03

  • Keep the content, with a notice at the top that the page is no longer being updated. I was a little uncomfortable with this, since I wasn't sure people would see the notice, it duplicates some content, and still leaves the potential problems of GitHub not rendering the page. If we cut some content, it ensures the page still renders reliably.

    • As a variant, we could delete the content but keep the last 1 or 2 releases since those are probably what people will be looking for.

Opening as draft until #15119 is published on nightly.

The changelog is now located in the cargo book.
@rustbot
Copy link
Collaborator

rustbot commented Jan 29, 2025

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 29, 2025
@weihanglo
Copy link
Member

The other alternative is we patching every link in blog.rust-lang.org. Admittedly this won't fix other links in the wild.

@ehuss ehuss marked this pull request as ready for review February 3, 2025 18:02
@ehuss ehuss changed the title [do not merge] Remove the original changelog Remove the original changelog Feb 3, 2025
@ehuss
Copy link
Contributor Author

ehuss commented Feb 3, 2025

This should be ready to go now that the docs are up at https://doc.rust-lang.org/nightly/cargo/CHANGELOG.html.

The other alternative is we patching every link in blog.rust-lang.org. Admittedly this won't fix other links in the wild.

I'm happy to post a PR to fix those links, too.

@weihanglo
Copy link
Member

This should be ready to go now that the docs are up at doc.rust-lang.org/nightly/cargo/CHANGELOG.html.

The other alternative is we patching every link in blog.rust-lang.org. Admittedly this won't fix other links in the wild.

I'm happy to post a PR to fix those links, too.

Should that be a blocker of merging this? I am fine with either way.

cc @epage, wonder what your thought is, as you were in the previous discussion.

@epage
Copy link
Contributor

epage commented Feb 3, 2025

That works for those links but not for any others (bookmarks, browser history, links from issues, etc). If they land on a generic 404 page, that isn't great. It is probably fine for them to have to search within a page. Releases are easy to find. We didn't have anchors to specific items, so work for that was already needed.

I also find that the first place I look for a changelog is by looking for a file in a repo root. I rarely think to check Releases. I'll likely miss it in the body of the text here.

Options

  • Symlink the book to the root or symlink the root to the book
  • Make the changelog only contain a link to the web page
  • Fork and freeze the changelog with a top-level item pointing to the web page

@ehuss
Copy link
Contributor Author

ehuss commented Feb 3, 2025

If they land on a generic 404 page

The page isn't being removed. There is a placeholder that directs them to the new location.

Make the changelog only contain a link to the web page

This is the option I'm proposing here.

The reason for not symlinking is that I would prefer to avoid having users assume they can look at that file on GitHub, since there is risk it won't render at all. I'd also like to make it easier to do relative links within the book (which can help with offline viewing, link validation, etc.).

The reason I refrained from the fork-and-freeze approach is because I wanted to avoid having two copies of a large amount of content. It may be hard for the user to see a notice at the top of the page that it is no longer being updated if there is still a large amount of content displayed to the user. It also doesn't help with the "possibly doesn't render" problem.

@epage
Copy link
Contributor

epage commented Feb 3, 2025

The page isn't being removed. There is a placeholder that directs them to the new location.

Sorry, I looked too closely and thought it was deleted.

That should work.

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we are okay with the caveat that some links in the wild may be invalid, so I am going to merge it. Thanks for fixing the issue!

@weihanglo weihanglo added this pull request to the merge queue Feb 3, 2025
Merged via the queue into rust-lang:master with commit eddd7ec Feb 3, 2025
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 8, 2025
Update cargo

14 commits in 0e3d73849ab8cbbab3ec5c65cbd555586cb21339..2928e32734b04925ee51e1ae88bea9a83d2fd451
2025-02-01 20:14:40 +0000 to 2025-02-07 16:50:22 +0000
- Simplify backtrack (rust-lang/cargo#15150)
- Don't use on Solaris libc::LOCK_* which were removed from libc in ver… (rust-lang/cargo#15143)
- feat: emit error if package not found within workspace (rust-lang/cargo#15071)
- Make cache tracking resilient to unexpected files (rust-lang/cargo#15147)
- Small resolver cleanups (rust-lang/cargo#15040)
- feat: add `cargo pkgid` support for cargo-script (rust-lang/cargo#14961)
- Suggest similar feature names on CLI (rust-lang/cargo#15133)
- fix: Don't use "did you mean" in errors (rust-lang/cargo#15138)
- Fix changelog link (rust-lang/cargo#15142)
- chore(deps): update rust crate rand to 0.9.0 (rust-lang/cargo#15129)
- Remove the original changelog (rust-lang/cargo#15123)
- chore(deps): update rust crate gix to 0.70.0 (rust-lang/cargo#15128)
- allow windows reserved names in CI (rust-lang/cargo#15135)
- removed a word that was repeated (rust-lang/cargo#15136)
@rustbot rustbot added this to the 1.86.0 milestone Feb 8, 2025
github-merge-queue bot pushed a commit that referenced this pull request May 25, 2025
<!--
Thanks for submitting a pull request 🎉! Here are some tips for you:

* If this is your first contribution, read "Cargo Contribution Guide"
first:
  https://doc.crates.io/contrib/
* Run `cargo fmt --all` to format your code changes.
* Small commits and pull requests are always preferable and easy to
review.
* If your idea is large and needs feedback from the community, read how:
  https://doc.crates.io/contrib/process/#working-on-large-features
* Cargo takes care of compatibility. Read our design principles:
  https://doc.crates.io/contrib/design.html
* When changing help text of cargo commands, follow the steps to
generate docs:

https://github.com/rust-lang/cargo/tree/master/src/doc#building-the-man-pages
* If your PR is not finished, set it as "draft" PR or add "WIP" in its
title.
* It's ok to use the CI resources to test your PR, but please don't
abuse them.

### What does this PR try to resolve?

Explain the motivation behind this change.
A clear overview along with an in-depth explanation are helpful.

You can use `Fixes #<issue number>` to associate this PR to an existing
issue.

### How should we test and review this PR?

Demonstrate how you test this change and guide reviewers through your
PR.
With a smooth review process, a pull request usually gets reviewed
quicker.

If you don't know how to write and run your tests, please read the
guide:
https://doc.crates.io/contrib/tests

### Additional information

Other information you want to mention in this PR, such as prior arts,
future extensions, an unresolved problem, or a TODO list.
-->
### What does this PR try to resolve?

When Cargo's changelog was moved into the book in #15123, it seems the
extension was left as `.md`, whereas the link should point to the
rendered version, which ends with `.html`.

### How should we test and review this PR?

Following the new link in the README's rendered view and observing that
it does indeed point to the changelog should be enough.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants