Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package taplo for openSUSE:Factory checked in at 2024-08-01 22:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/taplo (Old) and /work/SRC/openSUSE:Factory/.taplo.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "taplo" Thu Aug 1 22:04:33 2024 rev:2 rq:1190756 version:0.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/taplo/taplo.changes 2024-07-22 17:20:39.391661842 +0200 +++ /work/SRC/openSUSE:Factory/.taplo.new.7232/taplo.changes 2024-08-01 22:05:04.262054446 +0200 @@ -1,0 +2,7 @@ +Wed Jul 31 14:11:38 UTC 2024 - Joshua Smith <smolsh...@opensuse.org> + +- Update to 0.9.3: + * Fix regression: [rule.formatting] completely overrides the + default outside of the specified sections + +------------------------------------------------------------------- Old: ---- taplo-0.9.2.tar.gz New: ---- taplo-0.9.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ taplo.spec ++++++ --- /var/tmp/diff_new_pack.9YBHXA/_old 2024-08-01 22:05:06.890162839 +0200 +++ /var/tmp/diff_new_pack.9YBHXA/_new 2024-08-01 22:05:06.890162839 +0200 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: taplo -Version: 0.9.2 +Version: 0.9.3 Release: 0 Summary: A TOML toolkit written in Rust License: MIT ++++++ taplo-0.9.2.tar.gz -> taplo-0.9.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/Cargo.lock new/taplo-0.9.3/Cargo.lock --- old/taplo-0.9.2/Cargo.lock 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/Cargo.lock 2024-07-31 13:14:31.000000000 +0200 @@ -2361,9 +2361,9 @@ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2382,9 +2382,9 @@ [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/lsp-async-stub/Cargo.toml new/taplo-0.9.3/crates/lsp-async-stub/Cargo.toml --- old/taplo-0.9.2/crates/lsp-async-stub/Cargo.toml 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/lsp-async-stub/Cargo.toml 2024-07-31 13:14:31.000000000 +0200 @@ -3,7 +3,7 @@ description = "An LSP server stub for futures" edition = "2021" name = "lsp-async-stub" -version = "0.6.3" +version = "0.6.4" license = "MIT" repository = "https://github.com/tamasfe/taplo"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo/CHANGELOG.md new/taplo-0.9.3/crates/taplo/CHANGELOG.md --- old/taplo-0.9.2/crates/taplo/CHANGELOG.md 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo/CHANGELOG.md 2024-07-31 13:14:31.000000000 +0200 @@ -1,5 +1,9 @@ # Change Log +## 0.13.2 + +- Revert "Account for trailing comments in span handling (#527)" to fix sorting regression + ## 0.13.1 ### Fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo/Cargo.toml new/taplo-0.9.3/crates/taplo/Cargo.toml --- old/taplo-0.9.2/crates/taplo/Cargo.toml 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo/Cargo.toml 2024-07-31 13:14:31.000000000 +0200 @@ -9,7 +9,7 @@ name = "taplo" readme = false repository = "https://github.com/tamasfe/taplo"; -version = "0.13.1" +version = "0.13.2" [features] default = ["serde"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo/src/dom/node.rs new/taplo-0.9.3/crates/taplo/src/dom/node.rs --- old/taplo-0.9.2/crates/taplo/src/dom/node.rs 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo/src/dom/node.rs 2024-07-31 13:14:31.000000000 +0200 @@ -244,11 +244,6 @@ Ok(all.into_iter()) } - /// Determine the portions of the source that correspond to this - /// `Node`. - /// - /// Since a symbol may appear in multiple places, a single node - /// may correspond to multiple `TextRange`s. pub fn text_ranges(&self) -> impl ExactSizeIterator<Item = TextRange> { let mut ranges = Vec::with_capacity(1); @@ -261,20 +256,7 @@ ranges.extend(entry.text_ranges()); } - // consider both v.syntax() and its parent node when - // broadening the range. v.syntax() is only the - // TableHeader, where its parent is the full Table - // syntax node. Take a range which encompasses both. - let syntax_range = match ( - v.syntax().map(|n| n.text_range()), - v.syntax().and_then(|h| h.parent()).map(|n| n.text_range()), - ) { - (Some(child), Some(parent)) => Some(child.cover(parent)), - (Some(child), None) => Some(child), - (None, Some(parent)) => Some(parent), - _ => None, - }; - if let Some(mut r) = syntax_range { + if let Some(mut r) = v.syntax().map(|s| s.text_range()) { for range in &ranges { r = r.cover(*range); } @@ -677,30 +659,3 @@ Self::Invalid(v) } } - -#[cfg(test)] -mod tests { - #[test] - fn test_dom_find_all_matches_includes_comments() { - let source = r#" -[table] -key = "value" # comment -"#; - let dom = crate::parser::parse(source).into_dom(); - let matches = dom - .find_all_matches("table".parse().unwrap(), false) - .unwrap() - .collect::<Vec<_>>(); - assert_eq!(1, matches.len()); - let (_, node) = matches.first().unwrap(); - - // Ensure that at least one of the resultant spans includes - // the comment. - let spans = node.text_ranges().map(|r| &source[r]).collect::<Vec<_>>(); - assert!( - spans.iter().any(|s| s.contains('#')), - "expected one of {:?} to contain a comment", - &spans - ); - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo/src/tests/formatter.rs new/taplo-0.9.3/crates/taplo/src/tests/formatter.rs --- old/taplo-0.9.2/crates/taplo/src/tests/formatter.rs 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo/src/tests/formatter.rs 2024-07-31 13:14:31.000000000 +0200 @@ -1026,41 +1026,6 @@ assert_format!(expected, &formatted); } -/// See https://github.com/tamasfe/taplo/issues/464 -#[test] -fn test_reorder_keys_trailing_comment() { - let src = r#" -[mytable] -a = "a" -c = "c" -b = "b" # ... -"#; - - let expected = r#" -[mytable] -a = "a" -b = "b" # ... -c = "c" -"#; - - let p = crate::parser::parse(src); - let formatted = crate::formatter::format_with_path_scopes( - p.into_dom(), - Default::default(), - &[], - vec![( - "mytable", - formatter::OptionsIncomplete { - reorder_keys: Some(true), - ..Default::default() - }, - )], - ) - .unwrap(); - - assert_format!(expected, &formatted); -} - #[test] fn test_single_comment_no_alignment() { let src = r#" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo-cli/CHANGELOG.md new/taplo-0.9.3/crates/taplo-cli/CHANGELOG.md --- old/taplo-0.9.2/crates/taplo-cli/CHANGELOG.md 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo-cli/CHANGELOG.md 2024-07-31 13:14:31.000000000 +0200 @@ -1,5 +1,11 @@ # Change Log +## 0.9.3 + +### Fixes + +- Regression: `[rule.formatting]` completely overrides the default outside of the specified sections ([#634](https://github.com/tamasfe/taplo/issues/634)) + ## 0.9.2 This is a re-release of 0.9.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo-cli/Cargo.toml new/taplo-0.9.3/crates/taplo-cli/Cargo.toml --- old/taplo-0.9.2/crates/taplo-cli/Cargo.toml 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo-cli/Cargo.toml 2024-07-31 13:14:31.000000000 +0200 @@ -4,7 +4,7 @@ license = "MIT" edition = "2021" name = "taplo-cli" -version = "0.9.2" +version = "0.9.3" homepage = "https://taplo.tamasfe.dev"; repository = "https://github.com/tamasfe/taplo"; categories = ["development-tools", "command-line-utilities"] @@ -34,9 +34,9 @@ schemars = "0.8" serde = "1" serde_json = "1" -taplo = { version = "0.13.1", path = "../taplo", features = ["serde"] } -taplo-common = { version = "0.5.1", path = "../taplo-common" } -taplo-lsp = { version = "0.7.1", path = "../taplo-lsp", default-features = false, optional = true } +taplo = { version = "0.13.2", path = "../taplo", features = ["serde"] } +taplo-common = { version = "0.5.2", path = "../taplo-common" } +taplo-lsp = { version = "0.7.2", path = "../taplo-lsp", default-features = false, optional = true } time = { version = "0.3", features = ["parsing"] } toml = "0.7" tracing = "0.1.29" @@ -56,7 +56,7 @@ "rt-multi-thread", "parking_lot", ], default-features = false } -lsp-async-stub = { version = "0.6.0", path = "../lsp-async-stub", features = [ +lsp-async-stub = { version = "0.6.4", path = "../lsp-async-stub", features = [ "tokio-tcp", "tokio-stdio", ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo-common/CHANGELOG.md new/taplo-0.9.3/crates/taplo-common/CHANGELOG.md --- old/taplo-0.9.2/crates/taplo-common/CHANGELOG.md 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo-common/CHANGELOG.md 2024-07-31 13:14:31.000000000 +0200 @@ -1,5 +1,9 @@ # Change Log +## 0.5.2 + +This is a re-release of 0.5.1 + ## 0.5.1 ### Fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo-common/Cargo.toml new/taplo-0.9.3/crates/taplo-common/Cargo.toml --- old/taplo-0.9.2/crates/taplo-common/Cargo.toml 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo-common/Cargo.toml 2024-07-31 13:14:31.000000000 +0200 @@ -1,6 +1,6 @@ [package] name = "taplo-common" -version = "0.5.1" +version = "0.5.2" edition = "2021" description = "Shared code for taplo utilities." license = "MIT" @@ -36,7 +36,7 @@ serde_json = { version = "1.0.78", features = ["preserve_order"] } sha1 = "0.10.5" tap = "1.0.1" -taplo = { version = "0.13.0", path = "../taplo", features = ["schema"] } +taplo = { version = "0.13.2", path = "../taplo", features = ["schema"] } thiserror = "1.0.30" time = { version = "0.3.7", features = ["serde"] } tracing = "0.1.29" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo-lsp/CHANGELOG.md new/taplo-0.9.3/crates/taplo-lsp/CHANGELOG.md --- old/taplo-0.9.2/crates/taplo-lsp/CHANGELOG.md 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo-lsp/CHANGELOG.md 2024-07-31 13:14:31.000000000 +0200 @@ -1,5 +1,9 @@ # Change Log +## 0.7.2 + +Re-release of 0.7.1 + ## 0.7.1 ### Fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo-lsp/Cargo.toml new/taplo-0.9.3/crates/taplo-lsp/Cargo.toml --- old/taplo-0.9.2/crates/taplo-lsp/Cargo.toml 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo-lsp/Cargo.toml 2024-07-31 13:14:31.000000000 +0200 @@ -3,7 +3,7 @@ description = "Language server for Taplo" edition = "2021" name = "taplo-lsp" -version = "0.7.1" +version = "0.7.2" license = "MIT" homepage = "https://taplo.tamasfe.dev"; repository = "https://github.com/tamasfe/taplo"; @@ -24,7 +24,7 @@ futures = "0.3.5" indexmap = { version = "1.6", features = ["serde"] } itertools = "0.10.3" -lsp-async-stub = { version = "0.6.3", path = "../lsp-async-stub" } +lsp-async-stub = { version = "0.6.4", path = "../lsp-async-stub" } lsp-types = { version = "0.93.0", features = ["proposed"] } once_cell = "1.5" parking_lot = "0.12.0" @@ -36,8 +36,8 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } tap = "1.0.1" -taplo = { version = "0.13.1", path = "../taplo", features = ["serde"] } -taplo-common = { version = "0.5.1", path = "../taplo-common" } +taplo = { version = "0.13.2", path = "../taplo", features = ["serde"] } +taplo-common = { version = "0.5.2", path = "../taplo-common" } time = { version = "0.3", features = ["formatting", "parsing"] } toml = "0.7" tracing = "0.1.29" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/taplo-0.9.2/crates/taplo-wasm/Cargo.lock new/taplo-0.9.3/crates/taplo-wasm/Cargo.lock --- old/taplo-0.9.2/crates/taplo-wasm/Cargo.lock 2024-07-12 12:57:48.000000000 +0200 +++ new/taplo-0.9.3/crates/taplo-wasm/Cargo.lock 2024-07-31 13:14:31.000000000 +0200 @@ -1679,7 +1679,7 @@ [[package]] name = "taplo-cli" -version = "0.9.1" +version = "0.9.2" dependencies = [ "ansi_term", "anyhow", @@ -1854,9 +1854,9 @@ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -1875,9 +1875,9 @@ [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/taplo/vendor.tar.zst /work/SRC/openSUSE:Factory/.taplo.new.7232/vendor.tar.zst differ: char 583133, line 2363
