diff options
| author | Laurențiu Nicola <lnicola@users.noreply.github.com> | 2024-10-24 17:54:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 17:54:25 +0000 |
| commit | aaae1d4c55f6e90d4bccb006190b22a3bcbda9e3 (patch) | |
| tree | 601c623bdb48d58bee0da4ae0e7c0b12cba93f05 | |
| parent | 0a8ebdf6a7aee58039f308cabc1ce25bb363494e (diff) | |
| parent | 9832131fd54432f70166ac91f847ef21e6f11002 (diff) | |
| download | rust-aaae1d4c55f6e90d4bccb006190b22a3bcbda9e3.tar.gz rust-aaae1d4c55f6e90d4bccb006190b22a3bcbda9e3.zip | |
Merge pull request #18405 from lnicola/fix-changelog
internal: Update changelog generation for merge queues
| -rw-r--r-- | src/tools/rust-analyzer/xtask/src/release/changelog.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/rust-analyzer/xtask/src/release/changelog.rs b/src/tools/rust-analyzer/xtask/src/release/changelog.rs index 086a4d463ea..343a9efbbc8 100644 --- a/src/tools/rust-analyzer/xtask/src/release/changelog.rs +++ b/src/tools/rust-analyzer/xtask/src/release/changelog.rs @@ -128,9 +128,10 @@ fn unescape(s: &str) -> String { } fn parse_pr_number(s: &str) -> Option<u32> { - const BORS_PREFIX: &str = "Merge #"; + const GITHUB_PREFIX: &str = "Merge pull request #"; const HOMU_PREFIX: &str = "Auto merge of #"; - if let Some(s) = s.strip_prefix(BORS_PREFIX) { + if let Some(s) = s.strip_prefix(GITHUB_PREFIX) { + let s = if let Some(space) = s.find(' ') { &s[..space] } else { s }; s.parse().ok() } else if let Some(s) = s.strip_prefix(HOMU_PREFIX) { if let Some(space) = s.find(' ') { |