rustc-dev-guide icon indicating copy to clipboard operation
rustc-dev-guide copied to clipboard

update const stability docs

Open RalfJung opened this issue 1 year ago • 1 comments

This updates the docs for https://github.com/rust-lang/rust/pull/131349. Should only land once that PR landed.

RalfJung avatar Oct 13 '24 08:10 RalfJung

@rust-lang/libs @rust-lang/libs-api FYI, and also would be good to get some feedback if you think this system makes sense or you would like to see some aspect of it work differently. :)

RalfJung avatar Oct 13 '24 08:10 RalfJung

https://github.com/rust-lang/rust/pull/131349 is merged now, so could someone merge this docs PR as well? :)

RalfJung avatar Oct 26 '24 11:10 RalfJung

Seems like this was merged with a rebase, not a clean merge? That makes it a lot harder to automatically track which of my branches have been merged already... :(

RalfJung avatar Nov 02 '24 07:11 RalfJung

I think I just clicked one of the merge buttons, I'll talk with other dev-guide maintainers and see we can stick with one of the merging options, lol.

jieyouxu avatar Nov 02 '24 07:11 jieyouxu

Seems like this was merged with a rebase, not a clean merge? That makes it a lot harder to automatically track which of my branches have been merged already... :(

@RalfJung actually just to clarify, would a rebase and merge work? I may have accidentally clicked the squash and merge button.

jieyouxu avatar Nov 02 '24 07:11 jieyouxu

Rebase and merge still means the commit as it exists in my branch does not end up in the repo, leaving me with no way to automatically determine that my branch was merged. So I have to delete all the old branches by hand, which is somewhat tedious. Lucky enough most rust-lang repos use a normal merge so I can have some scripts that detect all branches which have been merged (local and remote) and delete them. :)

I understand some people prefer a linear history, but I don't quite understand why... and in rust-lang we don't seem to have a default policy either way.

RalfJung avatar Nov 02 '24 07:11 RalfJung

Right. So apparently in this repo the default "merge" button is disabled for some reason, I'll ask around why... This is just docs so I really don't think the rust-lang/rust no merge policy is relevant (and that's no merge master into PR, not the other way around).

jieyouxu avatar Nov 02 '24 07:11 jieyouxu

rust-lang/rust uses merge commits without rebase to merge PRs. That's the repo that I originally developed my auto-branch-deletion tooling for. :) The policy there is only about no merge commits inside a PR.

RalfJung avatar Nov 02 '24 07:11 RalfJung