Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package just for openSUSE:Factory checked in at 2025-12-10 15:33:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/just (Old) and /work/SRC/openSUSE:Factory/.just.new.1939 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "just" Wed Dec 10 15:33:10 2025 rev:34 rq:1321820 version:1.44.1 Changes: -------- --- /work/SRC/openSUSE:Factory/just/just.changes 2025-12-08 11:57:03.421286838 +0100 +++ /work/SRC/openSUSE:Factory/.just.new.1939/just.changes 2025-12-10 15:33:54.222790298 +0100 @@ -1,0 +2,6 @@ +Tue Dec 9 16:26:22 UTC 2025 - Richard Rahl <[email protected]> + +- Update to version 1.44.1: + * Properly close format string delimiter + +------------------------------------------------------------------- Old: ---- just-1.44.0.tar.gz New: ---- just-1.44.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ just.spec ++++++ --- /var/tmp/diff_new_pack.CQdwkh/_old 2025-12-10 15:33:55.670851561 +0100 +++ /var/tmp/diff_new_pack.CQdwkh/_new 2025-12-10 15:33:55.674851730 +0100 @@ -18,7 +18,7 @@ %bcond_with tests Name: just -Version: 1.44.0 +Version: 1.44.1 Release: 0 Summary: Commmand runner License: (Apache-2.0 OR MIT) AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (MIT OR Unlicense) AND Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND MIT AND CC0-1.0 ++++++ just-1.44.0.tar.gz -> just-1.44.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/just-1.44.0/CHANGELOG.md new/just-1.44.1/CHANGELOG.md --- old/just-1.44.0/CHANGELOG.md 2025-12-07 01:29:11.000000000 +0100 +++ new/just-1.44.1/CHANGELOG.md 2025-12-09 09:30:03.000000000 +0100 @@ -1,6 +1,12 @@ Changelog ========= +[1.44.1](https://github.com/casey/just/releases/tag/1.44.1) - 2025-12-09 +------------------------------------------------------------------------ + +### Fixed +- Properly close format string delimiter ([#2997](https://github.com/casey/just/pull/2997) by [casey](https://github.com/casey)) + [1.44.0](https://github.com/casey/just/releases/tag/1.44.0) - 2025-12-06 ------------------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/just-1.44.0/Cargo.lock new/just-1.44.1/Cargo.lock --- old/just-1.44.0/Cargo.lock 2025-12-07 01:29:11.000000000 +0100 +++ new/just-1.44.1/Cargo.lock 2025-12-09 09:30:03.000000000 +0100 @@ -552,7 +552,7 @@ [[package]] name = "just" -version = "1.44.0" +version = "1.44.1" dependencies = [ "ansi_term", "blake3", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/just-1.44.0/Cargo.toml new/just-1.44.1/Cargo.toml --- old/just-1.44.0/Cargo.toml 2025-12-07 01:29:11.000000000 +0100 +++ new/just-1.44.1/Cargo.toml 2025-12-09 09:30:03.000000000 +0100 @@ -1,6 +1,6 @@ [package] name = "just" -version = "1.44.0" +version = "1.44.1" authors = ["Casey Rodarmor <[email protected]>"] autotests = false categories = ["command-line-utilities", "development-tools"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/just-1.44.0/src/lexer.rs new/just-1.44.1/src/lexer.rs --- old/just-1.44.0/src/lexer.rs 2025-12-07 01:29:11.000000000 +0100 +++ new/just-1.44.1/src/lexer.rs 2025-12-09 09:30:03.000000000 +0100 @@ -675,15 +675,13 @@ /// Lex an opening or closing delimiter fn lex_delimiter(&mut self, kind: TokenKind) -> CompileResult<'src> { - use Delimiter::*; - match kind { - BraceL => self.open_delimiter(Brace), - BraceR => self.close_delimiter(Brace)?, - BracketL => self.open_delimiter(Bracket), - BracketR => self.close_delimiter(Bracket)?, - ParenL => self.open_delimiter(Paren), - ParenR => self.close_delimiter(Paren)?, + BraceL => self.open_delimiter(Delimiter::Brace), + BraceR => self.close_delimiter(Delimiter::Brace)?, + BracketL => self.open_delimiter(Delimiter::Bracket), + BracketR => self.close_delimiter(Delimiter::Bracket)?, + ParenL => self.open_delimiter(Delimiter::Paren), + ParenR => self.close_delimiter(Delimiter::Paren)?, _ => { return Err(self.internal_error(format!( "Lexer::lex_delimiter called with non-delimiter token: `{kind}`", @@ -692,7 +690,9 @@ } // Emit the delimiter token - self.lex_single(kind) + self.lex_single(kind)?; + + Ok(()) } /// Push a delimiter onto the open delimiter stack @@ -900,12 +900,12 @@ if format && self.rest_starts_with(Self::INTERPOLATION_START) { self.presume_str(Self::INTERPOLATION_START)?; - self.token(if format_string_kind.is_some() { - FormatStringContinue + if format_string_kind.is_some() { + self.token(FormatStringContinue); } else { - FormatStringStart - }); - self.open_delimiter(Delimiter::FormatString(kind)); + self.token(FormatStringStart); + self.open_delimiter(Delimiter::FormatString(kind)); + } } else { self.presume_str(kind.delimiter())?; @@ -2197,6 +2197,46 @@ ), } + test! { + name: format_string_followed_by_recipe, + text: "foo := f'{{'foo'}}{{'bar'}}'\nbar:", + tokens: ( + Identifier: "foo", + Whitespace: " ", + ColonEquals: ":=", + Whitespace: " ", + Identifier: "f", + FormatStringStart: "'{{", + StringToken: "'foo'", + FormatStringContinue: "}}{{", + StringToken: "'bar'", + FormatStringEnd: "}}'", + Eol: "\n", + Identifier: "bar", + Colon, + ), + } + + test! { + name: indented_format_string_followed_by_recipe, + text: "foo := f'''{{'foo'}}{{'bar'}}'''\nbar:", + tokens: ( + Identifier: "foo", + Whitespace: " ", + ColonEquals: ":=", + Whitespace: " ", + Identifier: "f", + FormatStringStart: "'''{{", + StringToken: "'foo'", + FormatStringContinue: "}}{{", + StringToken: "'bar'", + FormatStringEnd: "}}'''", + Eol: "\n", + Identifier: "bar", + Colon, + ), + } + error! { name: tokenize_space_then_tab, input: "a: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/just-1.44.0/tests/format_string.rs new/just-1.44.1/tests/format_string.rs --- old/just-1.44.0/tests/format_string.rs 2025-12-07 01:29:11.000000000 +0100 +++ new/just-1.44.1/tests/format_string.rs 2025-12-09 09:30:03.000000000 +0100 @@ -354,3 +354,15 @@ ) .run(); } + +#[test] +fn format_string_followed_by_recipe() { + Test::new() + .justfile( + " + foo := f'{{'foo'}}{{'bar'}}' + bar: + ", + ) + .run(); +} ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/just/vendor.tar.zst /work/SRC/openSUSE:Factory/.just.new.1939/vendor.tar.zst differ: char 7, line 1
