diff -Nru rust-grep-matcher-0.1.5/Cargo.toml rust-grep-matcher-0.1.6/Cargo.toml --- rust-grep-matcher-0.1.5/Cargo.toml 1970-01-01 00:00:01.000000000 +0000 +++ rust-grep-matcher-0.1.6/Cargo.toml 1970-01-01 00:00:01.000000000 +0000 @@ -3,31 +3,38 @@ # When uploading crates to the registry Cargo will automatically # "normalize" Cargo.toml files for maximal compatibility # with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies +# to registry (e.g., crates.io) dependencies. # -# If you believe there's an error in this file please file an -# issue against the rust-lang/cargo repository. If you're -# editing this file be aware that the upstream Cargo.toml -# will likely look very different (and much more reasonable) +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. [package] edition = "2018" name = "grep-matcher" -version = "0.1.5" +version = "0.1.6" authors = ["Andrew Gallant "] autotests = false -description = "A trait for regular expressions, with a focus on line oriented search.\n" +description = """ +A trait for regular expressions, with a focus on line oriented search. +""" homepage = "https://github.com/BurntSushi/ripgrep/tree/master/crates/matcher" documentation = "https://docs.rs/grep-matcher" readme = "README.md" -keywords = ["regex", "pattern", "trait"] -license = "Unlicense/MIT" +keywords = [ + "regex", + "pattern", + "trait", +] +license = "Unlicense OR MIT" repository = "https://github.com/BurntSushi/ripgrep/tree/master/crates/matcher" [[test]] name = "integration" path = "tests/tests.rs" + [dependencies.memchr] version = "2.1" + [dev-dependencies.regex] version = "1.1" diff -Nru rust-grep-matcher-0.1.5/Cargo.toml.orig rust-grep-matcher-0.1.6/Cargo.toml.orig --- rust-grep-matcher-0.1.5/Cargo.toml.orig 1973-11-29 21:33:09.000000000 +0000 +++ rust-grep-matcher-0.1.6/Cargo.toml.orig 2006-07-24 01:21:28.000000000 +0000 @@ -1,6 +1,6 @@ [package] name = "grep-matcher" -version = "0.1.5" #:version +version = "0.1.6" #:version authors = ["Andrew Gallant "] description = """ A trait for regular expressions, with a focus on line oriented search. @@ -10,7 +10,7 @@ repository = "https://github.com/BurntSushi/ripgrep/tree/master/crates/matcher" readme = "README.md" keywords = ["regex", "pattern", "trait"] -license = "Unlicense/MIT" +license = "Unlicense OR MIT" autotests = false edition = "2018" diff -Nru rust-grep-matcher-0.1.5/.cargo_vcs_info.json rust-grep-matcher-0.1.6/.cargo_vcs_info.json --- rust-grep-matcher-0.1.5/.cargo_vcs_info.json 1970-01-01 00:00:01.000000000 +0000 +++ rust-grep-matcher-0.1.6/.cargo_vcs_info.json 1970-01-01 00:00:01.000000000 +0000 @@ -1,5 +1,6 @@ { "git": { - "sha1": "cd4386bd9b5d51d344814bad2db3e3e79c1cf47d" - } -} + "sha1": "bc78c644db115de518a083e192312da77cfffdca" + }, + "path_in_vcs": "crates/matcher" +} \ No newline at end of file diff -Nru rust-grep-matcher-0.1.5/debian/cargo-checksum.json rust-grep-matcher-0.1.6/debian/cargo-checksum.json --- rust-grep-matcher-0.1.5/debian/cargo-checksum.json 2021-08-21 19:17:54.000000000 +0000 +++ rust-grep-matcher-0.1.6/debian/cargo-checksum.json 2023-06-12 20:22:38.000000000 +0000 @@ -1 +1 @@ -{"package":"6d27563c33062cd33003b166ade2bb4fd82db1fd6a86db764dfdad132d46c1cc","files":{}} +{"package":"3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319","files":{}} diff -Nru rust-grep-matcher-0.1.5/debian/changelog rust-grep-matcher-0.1.6/debian/changelog --- rust-grep-matcher-0.1.5/debian/changelog 2021-08-21 19:17:54.000000000 +0000 +++ rust-grep-matcher-0.1.6/debian/changelog 2023-06-12 20:22:38.000000000 +0000 @@ -1,3 +1,10 @@ +rust-grep-matcher (0.1.6-1) unstable; urgency=medium + + * Team upload. + * Package grep-matcher 0.1.6 from crates.io using debcargo 2.6.0 + + -- Peter Michael Green Mon, 12 Jun 2023 20:22:38 +0000 + rust-grep-matcher (0.1.5-2) unstable; urgency=medium * Team upload. diff -Nru rust-grep-matcher-0.1.5/debian/control rust-grep-matcher-0.1.6/debian/control --- rust-grep-matcher-0.1.5/debian/control 2021-08-21 19:17:54.000000000 +0000 +++ rust-grep-matcher-0.1.6/debian/control 2023-06-12 20:22:38.000000000 +0000 @@ -2,7 +2,7 @@ Section: rust Priority: optional Build-Depends: debhelper (>= 12), - dh-cargo (>= 24), + dh-cargo (>= 25), cargo:native , rustc:native , libstd-rust-dev , @@ -10,10 +10,11 @@ Maintainer: Debian Rust Maintainers Uploaders: kpcyrd -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/grep-matcher] Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/grep-matcher Homepage: https://github.com/BurntSushi/ripgrep/tree/master/crates/matcher +X-Cargo-Crate: grep-matcher Rules-Requires-Root: no Package: librust-grep-matcher-dev @@ -28,8 +29,8 @@ librust-grep-matcher-0+default-dev (= ${binary:Version}), librust-grep-matcher-0.1-dev (= ${binary:Version}), librust-grep-matcher-0.1+default-dev (= ${binary:Version}), - librust-grep-matcher-0.1.5-dev (= ${binary:Version}), - librust-grep-matcher-0.1.5+default-dev (= ${binary:Version}) -Description: Trait for regular expressions, with a focus on line oriented search - Rust source code + librust-grep-matcher-0.1.6-dev (= ${binary:Version}), + librust-grep-matcher-0.1.6+default-dev (= ${binary:Version}) +Description: Trait for regular expressions for line oriented search - Rust source code This package contains the source for the Rust grep-matcher crate, packaged by debcargo for use with cargo and dh-cargo. diff -Nru rust-grep-matcher-0.1.5/debian/copyright rust-grep-matcher-0.1.6/debian/copyright --- rust-grep-matcher-0.1.5/debian/copyright 2021-08-21 19:17:54.000000000 +0000 +++ rust-grep-matcher-0.1.6/debian/copyright 2023-06-12 20:22:38.000000000 +0000 @@ -4,12 +4,12 @@ Source: https://github.com/BurntSushi/ripgrep Files: * -Copyright: 2015-2018 Andrew Gallant +Copyright: 2015-2023 Andrew Gallant License: Unlicense or MIT Files: debian/* Copyright: - 2018 Debian Rust Maintainers + 2018-2023 Debian Rust Maintainers 2018 kpcyrd License: Unlicense or MIT diff -Nru rust-grep-matcher-0.1.5/debian/copyright.debcargo.hint rust-grep-matcher-0.1.6/debian/copyright.debcargo.hint --- rust-grep-matcher-0.1.5/debian/copyright.debcargo.hint 2021-08-21 19:17:54.000000000 +0000 +++ rust-grep-matcher-0.1.6/debian/copyright.debcargo.hint 2023-06-12 20:22:38.000000000 +0000 @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-MIT +Files: LICENSE-MIT Copyright: 2015 Andrew Gallant License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2018-2021 Debian Rust Maintainers - 2018-2021 kpcyrd + 2018-2023 Debian Rust Maintainers + 2018-2023 kpcyrd License: Unlicense or MIT License: MIT diff -Nru rust-grep-matcher-0.1.5/debian/tests/control rust-grep-matcher-0.1.6/debian/tests/control --- rust-grep-matcher-0.1.5/debian/tests/control 2021-08-21 19:17:54.000000000 +0000 +++ rust-grep-matcher-0.1.6/debian/tests/control 2023-06-12 20:22:38.000000000 +0000 @@ -1,14 +1,14 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test grep-matcher 0.1.5 --all-targets --all-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test grep-matcher 0.1.6 --all-targets --all-features Features: test-name=rust-grep-matcher:@ Depends: dh-cargo (>= 18), librust-regex-1+default-dev (>= 1.1-~~), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test grep-matcher 0.1.5 --all-targets +Test-Command: /usr/share/cargo/bin/cargo-auto-test grep-matcher 0.1.6 --all-targets Features: test-name=librust-grep-matcher-dev:default Depends: dh-cargo (>= 18), librust-regex-1+default-dev (>= 1.1-~~), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test grep-matcher 0.1.5 --all-targets --no-default-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test grep-matcher 0.1.6 --all-targets --no-default-features Features: test-name=librust-grep-matcher-dev: Depends: dh-cargo (>= 18), librust-regex-1+default-dev (>= 1.1-~~), @ Restrictions: allow-stderr, skip-not-installable diff -Nru rust-grep-matcher-0.1.5/src/lib.rs rust-grep-matcher-0.1.6/src/lib.rs --- rust-grep-matcher-0.1.5/src/lib.rs 1973-11-29 21:33:09.000000000 +0000 +++ rust-grep-matcher-0.1.6/src/lib.rs 2006-07-24 01:21:28.000000000 +0000 @@ -116,7 +116,7 @@ /// This method panics if `start > self.end`. #[inline] pub fn with_start(&self, start: usize) -> Match { - assert!(start <= self.end); + assert!(start <= self.end, "{} is not <= {}", start, self.end); Match { start, ..*self } } @@ -128,7 +128,7 @@ /// This method panics if `self.start > end`. #[inline] pub fn with_end(&self, end: usize) -> Match { - assert!(self.start <= end); + assert!(self.start <= end, "{} is not <= {}", self.start, end); Match { end, ..*self } }