update more cargo dependencies, needed for vendoring latest versions
Ximin Luo
2 years ago
0 | rust-adler (0.2.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-adler (1.0.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | 1 | |
2 | * Team upload. | |
3 | * Package adler 1.0.2 from crates.io using debcargo 2.4.4 | |
4 | ||
5 | [ Daniel Kahn Gillmor ] | |
2 | 6 | * Package adler 0.2.3 from crates.io using debcargo 2.4.3 |
3 | 7 | * drop unnecessary benchmarking to avoid criterion dependency |
4 | 8 | * clean up test with --no-default-features (fix already upstream |
5 | 9 | but not yet released) |
6 | 10 | |
7 | -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Mon, 19 Oct 2020 13:04:00 -0400 | |
11 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:03:12 +0100 |
8 | 8 | |
9 | 9 | Files: debian/* |
10 | 10 | Copyright: |
11 | 2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
11 | 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 12 | 2020 Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
13 | 13 | License: 0BSD or MIT or Apache-2.0 |
14 | 14 |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2020 Daniel Kahn Gillmor <dkg@fifthhorseman.net> | |
16 | 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2020-2021 Daniel Kahn Gillmor <dkg@fifthhorseman.net> | |
18 | 18 | License: 0BSD or MIT or Apache-2.0 |
19 | 19 | |
20 | 20 | License: 0BSD |
0 | rust-bstr (0.2.17-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package bstr 0.2.17 from crates.io using debcargo 2.4.4 | |
4 | ||
5 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:04:08 +0100 | |
6 | ||
0 | 7 | rust-bstr (0.2.12-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Package bstr 0.2.12 from crates.io using debcargo 2.4.0 |
12 | 12 | |
13 | 13 | Files: debian/* |
14 | 14 | Copyright: |
15 | 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
15 | 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
16 | 16 | 2019 Sylvestre Ledru <sylvestre@debian.org> |
17 | 17 | License: MIT or Apache-2.0 |
18 | 18 |
48 | 48 | |
49 | 49 | Files: debian/* |
50 | 50 | Copyright: |
51 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
52 | 2019-2020 Sylvestre Ledru <sylvestre@debian.org> | |
51 | 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
52 | 2019-2021 Sylvestre Ledru <sylvestre@debian.org> | |
53 | 53 | License: MIT or Apache-2.0 |
54 | 54 | |
55 | 55 | License: Apache-2.0 |
0 | Index: bstr/Cargo.toml | |
1 | =================================================================== | |
2 | --- bstr.orig/Cargo.toml | |
3 | +++ bstr/Cargo.toml | |
4 | @@ -33,7 +33,7 @@ version = "1.2" | |
5 | optional = true | |
6 | ||
7 | [dependencies.memchr] | |
8 | -version = "2.1.2" | |
9 | +version = "2.2.1" | |
10 | default-features = false | |
11 | ||
12 | [dependencies.regex-automata] |
0 | rust-getrandom (0.1.14-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-getrandom (0.1.16-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | 1 | |
2 | 2 | * Team upload. |
3 | * Package getrandom 0.1.14 from crates.io using debcargo 2.4.2 | |
3 | * Package getrandom 0.1.16 from crates.io using debcargo 2.4.4 | |
4 | 4 | |
5 | -- Ximin Luo <infinity0@debian.org> Sat, 18 Apr 2020 19:10:02 +0100 | |
5 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:34:16 +0100 | |
6 | 6 | |
7 | 7 | rust-getrandom (0.1.13-4) unstable; urgency=medium |
8 | 8 |
176 | 176 | |
177 | 177 | Files: debian/* |
178 | 178 | Copyright: |
179 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
180 | 2019-2020 kpcyrd <git@rxv.cc> | |
179 | 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
180 | 2019-2021 kpcyrd <git@rxv.cc> | |
181 | 181 | License: MIT or Apache-2.0 |
182 | 182 | |
183 | 183 | License: Apache-2.0 |
0 | Index: getrandom/Cargo.toml | |
1 | =================================================================== | |
2 | --- getrandom.orig/Cargo.toml | |
3 | +++ getrandom/Cargo.toml | |
4 | @@ -42,8 +42,6 @@ dummy = [] | |
5 | rustc-dep-of-std = ["compiler_builtins", "core"] | |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -43,8 +43,6 @@ | |
6 | 3 | std = [] |
7 | 4 | test-in-browser = ["wasm-bindgen"] |
5 | wasm-bindgen = ["bindgen", "js-sys"] | |
8 | 6 | -[target."cfg(target_os = \"wasi\")".dependencies.wasi] |
9 | 7 | -version = "0.9" |
10 | 8 | [target."cfg(unix)".dependencies.libc] |
0 | rust-libssh2-sys (0.2.23-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package libssh2-sys 0.2.23 from crates.io using debcargo 2.4.4 | |
3 | ||
4 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:10:29 +0100 | |
5 | ||
0 | 6 | rust-libssh2-sys (0.2.20-1) unstable; urgency=medium |
1 | 7 | |
2 | 8 | * Team upload. |
14 | 14 | |
15 | 15 | Files: debian/* |
16 | 16 | Copyright: |
17 | 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
18 | 2018-2020 Ximin Luo <infinity0@debian.org> | |
17 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
18 | 2018-2021 Ximin Luo <infinity0@debian.org> | |
19 | 19 | License: MIT or Apache-2.0 |
20 | 20 | |
21 | 21 | License: Apache-2.0 |
19 | 19 | |
20 | 20 | Files: debian/* |
21 | 21 | Copyright: |
22 | 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
23 | 2018-2020 Ximin Luo <infinity0@debian.org> | |
22 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
23 | 2018-2021 Ximin Luo <infinity0@debian.org> | |
24 | 24 | License: MIT or Apache-2.0 |
25 | 25 | |
26 | 26 | License: Apache-2.0 |
0 | 0 | --- a/Cargo.toml |
1 | 1 | +++ b/Cargo.toml |
2 | @@ -35,7 +35,7 @@ | |
3 | version = "0.3.11" | |
2 | @@ -39,7 +39,6 @@ | |
4 | 3 | |
5 | 4 | [features] |
5 | openssl-on-win32 = ["openssl-sys"] | |
6 | 6 | -vendored-openssl = ["openssl-sys/vendored"] |
7 | +vendored-openssl = [] | |
8 | 7 | zlib-ng-compat = ["libz-sys/zlib-ng"] |
9 | 8 | [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] |
10 | 9 | version = "0.2" |
0 | 0 | --- a/build.rs |
1 | 1 | +++ b/build.rs |
2 | @@ -17,7 +17,7 @@ | |
2 | @@ -20,7 +20,7 @@ | |
3 | 3 | // can lead to having two copies of libssl loaded at once. |
4 | 4 | // See https://github.com/alexcrichton/ssh2-rs/pull/88 |
5 | 5 | println!("cargo:rerun-if-env-changed=LIBSSH2_SYS_USE_PKG_CONFIG"); |
8 | 8 | if zlib_ng_compat { |
9 | 9 | panic!("LIBSSH2_SYS_USE_PKG_CONFIG set, but cannot use zlib-ng-compat with system libssh2"); |
10 | 10 | } |
11 | @@ -26,7 +26,7 @@ | |
11 | @@ -32,7 +32,7 @@ | |
12 | 12 | } |
13 | 13 | } |
14 | 14 |
0 | --- libssh2-sys/Cargo.toml 2020-12-07 00:44:25.527275557 +0000 | |
1 | +++ libssh2-sys/Cargo.toml 2020-12-07 00:41:07.631483621 +0000 | |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | 2 | @@ -39,7 +39,6 @@ |
3 | 3 | |
4 | 4 | [features] |
5 | vendored-openssl = [] | |
5 | openssl-on-win32 = ["openssl-sys"] | |
6 | 6 | -zlib-ng-compat = ["libz-sys/zlib-ng"] |
7 | 7 | [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] |
8 | 8 | version = "0.2" |
0 | rust-log (0.4.14-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package log 0.4.14 from crates.io using debcargo 2.4.4 | |
4 | ||
5 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:12:57 +0100 | |
6 | ||
0 | 7 | rust-log (0.4.11-2) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Package log 0.4.11 from crates.io using debcargo 2.4.3 |
7 | 7 | License: MIT or Apache-2.0 |
8 | 8 | |
9 | 9 | Files: debian/* |
10 | Copyright: 2018-2020 Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
10 | Copyright: 2018-2021 Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
11 | 11 | 2018-2019 Sylvestre Ledru <sylvestre@debian.org> |
12 | 12 | 2020 Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
13 | 13 | License: MIT or Apache-2.0 |
34 | 34 | |
35 | 35 | Files: debian/* |
36 | 36 | Copyright: |
37 | 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
38 | 2018-2020 Sylvestre Ledru <sylvestre@debian.org> | |
37 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
38 | 2018-2021 Sylvestre Ledru <sylvestre@debian.org> | |
39 | 39 | License: MIT or Apache-2.0 |
40 | 40 | |
41 | 41 | License: Apache-2.0 |
0 | 0 | overlay = "." |
1 | 1 | uploaders = ["Sylvestre Ledru <sylvestre@debian.org>"] |
2 | allow_prerelease_deps = true | |
2 | 3 | |
3 | 4 | [packages."lib+@"] |
4 | 5 | test_is_broken = true |
0 | Index: log/Cargo.toml | |
1 | =================================================================== | |
2 | --- log.orig/Cargo.toml | |
3 | +++ log/Cargo.toml | |
4 | @@ -24,7 +24,7 @@ categories = ["development-tools::debugg | |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -24,7 +24,7 @@ | |
5 | 3 | license = "MIT OR Apache-2.0" |
6 | 4 | repository = "https://github.com/rust-lang/log" |
7 | 5 | [package.metadata.docs.rs] |
8 | -features = ["std", "serde", "kv_unstable_sval"] | |
9 | +features = ["std", "serde"] | |
6 | -features = ["std", "serde", "kv_unstable_std", "kv_unstable_sval", "kv_unstable_serde"] | |
7 | +features = ["std", "serde", "kv_unstable_std", "kv_unstable_serde"] | |
10 | 8 | |
11 | 9 | [[test]] |
12 | 10 | name = "filters" |
13 | @@ -41,20 +41,21 @@ version = "1.0" | |
11 | @@ -43,11 +43,6 @@ | |
14 | 12 | optional = true |
15 | 13 | default-features = false |
16 | 14 | |
17 | 15 | -[dependencies.sval] |
18 | -version = "0.5.2" | |
16 | -version = "1.0.0-alpha.5" | |
19 | 17 | -optional = true |
20 | 18 | -default-features = false |
21 | +# [dependencies.sval] | |
22 | +# version = "0.5.2" | |
23 | +# optional = true | |
24 | +# default-features = false | |
25 | + | |
19 | - | |
20 | [dependencies.value-bag] | |
21 | version = "1.0.0-alpha.6" | |
22 | optional = true | |
23 | @@ -59,10 +54,6 @@ | |
26 | 24 | [dev-dependencies.serde_test] |
27 | 25 | version = "1.0" |
28 | 26 | |
29 | 27 | -[dev-dependencies.sval] |
30 | -version = "0.5.2" | |
31 | -features = ["test"] | |
32 | +# [dev-dependencies.sval] | |
33 | +# version = "0.5.2" | |
34 | +# features = ["test"] | |
35 | ||
36 | [features] | |
37 | kv_unstable = [] | |
38 | -kv_unstable_sval = ["kv_unstable", "sval/fmt"] | |
39 | +kv_unstable_sval = ["kv_unstable"]#, "sval/fmt"] | |
28 | -version = "1.0.0-alpha.5" | |
29 | -features = ["derive"] | |
30 | - | |
31 | [dev-dependencies.value-bag] | |
32 | version = "1.0.0-alpha.6" | |
33 | features = ["test"] | |
34 | @@ -71,7 +62,6 @@ | |
35 | kv_unstable = ["value-bag"] | |
36 | kv_unstable_serde = ["kv_unstable_std", "value-bag/serde", "serde"] | |
37 | kv_unstable_std = ["std", "kv_unstable", "value-bag/error"] | |
38 | -kv_unstable_sval = ["kv_unstable", "value-bag/sval", "sval"] | |
40 | 39 | max_level_debug = [] |
41 | 40 | max_level_error = [] |
42 | 41 | max_level_info = [] |
0 | rust-openssl (0.10.36-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package openssl 0.10.36 from crates.io using debcargo 2.4.4 | |
3 | ||
4 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:15:56 +0100 | |
5 | ||
0 | 6 | rust-openssl (0.10.29-1) unstable; urgency=medium |
1 | 7 | |
2 | 8 | * Package openssl 0.10.29 from crates.io using debcargo 2.4.2 |
11 | 11 | |
12 | 12 | Files: debian/* |
13 | 13 | Copyright: |
14 | 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
15 | 2018-2020 Ximin Luo <infinity0@debian.org> | |
14 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
15 | 2018-2021 Ximin Luo <infinity0@debian.org> | |
16 | 16 | License: Apache-2.0 |
17 | 17 | |
18 | 18 | License: Apache-2.0 |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2018-2020 Ximin Luo <infinity0@debian.org> | |
23 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2018-2021 Ximin Luo <infinity0@debian.org> | |
25 | 25 | License: Apache-2.0 |
26 | 26 | |
27 | 27 | License: Apache-2.0 |
0 | 0 | --- a/Cargo.toml |
1 | 1 | +++ b/Cargo.toml |
2 | @@ -51,4 +51,4 @@ | |
2 | @@ -50,4 +50,3 @@ | |
3 | 3 | v102 = [] |
4 | 4 | v110 = [] |
5 | 5 | v111 = [] |
6 | -vendored = ["openssl-sys/vendored"] | |
7 | +vendored = [] | |
6 | -vendored = ["ffi/vendored"] |
0 | rust-pkg-config (0.3.21-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package pkg-config 0.3.21 from crates.io using debcargo 2.4.4 | |
3 | ||
4 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:22:21 +0100 | |
5 | ||
0 | 6 | rust-pkg-config (0.3.18-1) unstable; urgency=medium |
1 | 7 | |
2 | 8 | * Package pkg-config 0.3.18 from crates.io using debcargo 2.4.3 |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2018-2020 Ximin Luo <infinity0@debian.org> | |
23 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2018-2021 Ximin Luo <infinity0@debian.org> | |
25 | 25 | License: MIT or Apache-2.0 |
26 | 26 | |
27 | 27 | License: Apache-2.0 |
0 | 0 | --- a/src/lib.rs |
1 | 1 | +++ b/src/lib.rs |
2 | @@ -399,7 +389,11 @@ impl Config { | |
2 | @@ -414,7 +414,11 @@ | |
3 | 3 | fn command(&self, name: &str, args: &[&str]) -> Command { |
4 | 4 | let exe = self |
5 | .env_var_os("PKG_CONFIG") | |
5 | .targetted_env_var("PKG_CONFIG") | |
6 | 6 | - .unwrap_or_else(|| OsString::from("pkg-config")); |
7 | 7 | + .unwrap_or_else(|| { |
8 | 8 | + self.env_var_os("DEB_HOST_GNU_TYPE") |
0 | Index: pkg-config/tests/test.rs | |
1 | =================================================================== | |
2 | --- pkg-config.orig/tests/test.rs | |
3 | +++ pkg-config/tests/test.rs | |
4 | @@ -64,7 +64,6 @@ fn cross_enabled_if_customized() { | |
5 | find("foo").unwrap(); | |
6 | } | |
7 | ||
8 | -#[test] | |
9 | fn cross_disabled_if_customized() { | |
10 | let _g = LOCK.lock(); | |
11 | reset(); | |
12 | @@ -72,10 +71,10 @@ fn cross_disabled_if_customized() { | |
13 | env::set_var("HOST", "bar"); | |
14 | env::set_var("PKG_CONFIG_ALLOW_CROSS", "0"); | |
15 | env::set_var("PKG_CONFIG_SYSROOT_DIR", "/tmp/cross-test"); | |
16 | - match find("foo") { | |
17 | - Err(Error::CrossCompilation) => {} | |
18 | - _ => panic!("expected CrossCompilation failure"), | |
19 | - } | |
20 | +// match find("foo") { | |
21 | +// Err(Error::CrossCompilation) => {} | |
22 | +// _ => panic!("expected CrossCompilation failure"), | |
23 | +// } | |
24 | } | |
25 | ||
26 | #[test] |
0 | 0 | --- a/src/lib.rs |
1 | 1 | +++ b/src/lib.rs |
2 | @@ -9,8 +9,6 @@ | |
3 | //! A number of environment variables are available to globally configure how | |
4 | //! this crate will invoke `pkg-config`: | |
5 | //! | |
6 | -//! * `PKG_CONFIG_ALLOW_CROSS` - if this variable is not set, then `pkg-config` | |
7 | -//! will automatically be disabled for all cross compiles. | |
2 | @@ -12,13 +12,6 @@ | |
8 | 3 | //! * `FOO_NO_PKG_CONFIG` - if set, this will disable running `pkg-config` when |
9 | 4 | //! probing for the library named `foo`. |
10 | 5 | //! |
11 | @@ -106,9 +104,8 @@ pub enum Error { | |
6 | -//! * `PKG_CONFIG_ALLOW_CROSS` - The `pkg-config` command usually doesn't | |
7 | -//! support cross-compilation, and this crate prevents it from selecting | |
8 | -//! incompatible versions of libraries. | |
9 | -//! Setting `PKG_CONFIG_ALLOW_CROSS=1` disables this protection, which is | |
10 | -//! likely to cause linking errors, unless `pkg-config` has been configured | |
11 | -//! to use appropriate sysroot and search paths for the target platform. | |
12 | -//! | |
13 | //! There are also a number of environment variables which can configure how a | |
14 | //! library is linked to (dynamically vs statically). These variables control | |
15 | //! whether the `--static` flag is passed. Note that this behavior can be | |
16 | @@ -110,11 +103,8 @@ | |
12 | 17 | /// Contains the name of the responsible environment variable. |
13 | 18 | EnvNoPkgConfig(String), |
14 | 19 | |
15 | - /// Cross compilation detected. | |
20 | - /// Detected cross compilation without a custom sysroot. | |
16 | 21 | - /// |
17 | - /// Override with `PKG_CONFIG_ALLOW_CROSS=1`. | |
22 | - /// Ignore the error with `PKG_CONFIG_ALLOW_CROSS=1`, | |
23 | - /// which may let `pkg-config` select libraries | |
24 | - /// for the host's architecture instead of the target's. | |
18 | 25 | + /// Cross compilation detected. Kept for compatibility; |
19 | 26 | + /// the Debian package never emits this. |
20 | 27 | CrossCompilation, |
21 | 28 | |
22 | 29 | /// Failed to run `pkg-config`. |
23 | @@ -152,11 +145,6 @@ impl fmt::Display for Error { | |
30 | @@ -145,14 +135,6 @@ | |
24 | 31 | fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { |
25 | 32 | match *self { |
26 | 33 | Error::EnvNoPkgConfig(ref name) => write!(f, "Aborted because {} is set", name), |
27 | - Error::CrossCompilation => write!( | |
28 | - f, | |
29 | - "Cross compilation detected. \ | |
30 | - Use PKG_CONFIG_ALLOW_CROSS=1 to override" | |
34 | - Error::CrossCompilation => f.write_str( | |
35 | - "pkg-config has not been configured to support cross-compilation.\n\ | |
36 | - \n\ | |
37 | - Install a sysroot for the target platform and configure it via\n\ | |
38 | - PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_PATH, or install a\n\ | |
39 | - cross-compiling wrapper for pkg-config and set it via\n\ | |
40 | - PKG_CONFIG environment variable.", | |
31 | 41 | - ), |
32 | 42 | Error::Command { |
33 | 43 | ref command, |
34 | 44 | ref cause, |
35 | @@ -180,7 +168,7 @@ impl fmt::Display for Error { | |
45 | @@ -205,7 +187,7 @@ | |
36 | 46 | } |
37 | 47 | Ok(()) |
38 | 48 | } |
41 | 51 | } |
42 | 52 | } |
43 | 53 | } |
44 | @@ -341,6 +329,8 @@ impl Config { | |
54 | @@ -371,6 +353,8 @@ | |
45 | 55 | if host == target { |
46 | 56 | return true; |
47 | 57 | } |
52 | 62 | // a wrapper script that sets up platform-specific prefixes. |
53 | 63 | --- a/tests/test.rs |
54 | 64 | +++ b/tests/test.rs |
55 | @@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config | |
65 | @@ -34,7 +34,6 @@ | |
56 | 66 | pkg_config::probe_library(name) |
57 | 67 | } |
58 | 68 | |
60 | 70 | fn cross_disabled() { |
61 | 71 | let _g = LOCK.lock(); |
62 | 72 | reset(); |
63 | @@ -46,7 +45,6 @@ fn cross_disabled() { | |
73 | @@ -46,7 +45,6 @@ | |
64 | 74 | } |
65 | 75 | } |
66 | 76 | |
68 | 78 | fn cross_enabled() { |
69 | 79 | let _g = LOCK.lock(); |
70 | 80 | reset(); |
81 | @@ -66,7 +64,6 @@ | |
82 | find("foo").unwrap(); | |
83 | } | |
84 | ||
85 | -#[test] | |
86 | fn cross_disabled_if_customized() { | |
87 | let _g = LOCK.lock(); | |
88 | reset(); | |
89 | @@ -74,10 +71,10 @@ | |
90 | env::set_var("HOST", "bar"); | |
91 | env::set_var("PKG_CONFIG_ALLOW_CROSS", "0"); | |
92 | env::set_var("PKG_CONFIG_SYSROOT_DIR", "/tmp/cross-test"); | |
93 | - match find("foo") { | |
94 | - Err(Error::CrossCompilation) => {} | |
95 | - _ => panic!("expected CrossCompilation failure"), | |
96 | - } | |
97 | +// match find("foo") { | |
98 | +// Err(Error::CrossCompilation) => {} | |
99 | +// _ => panic!("expected CrossCompilation failure"), | |
100 | +// } | |
101 | } | |
102 | ||
103 | #[test] |
0 | rust-regex (1.3.9-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package regex 1.3.9 from crates.io using debcargo 2.4.4 | |
4 | ||
5 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:44:24 +0100 | |
6 | ||
0 | 7 | rust-regex (1.3.8-1) experimental; urgency=medium |
1 | 8 | |
2 | 9 | * Package regex 1.3.8 from crates.io using debcargo 2.4.4 |
0 | rust-regex-automata (0.1.10-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package regex-automata 0.1.10 from crates.io using debcargo 2.4.4 | |
4 | ||
5 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:51:04 +0100 | |
6 | ||
0 | 7 | rust-regex-automata (0.1.8-2) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Team upload. |
3 | 3 | Source: https://github.com/BurntSushi/regex-automata |
4 | 4 | |
5 | 5 | Files: * |
6 | Copyright: 2018-2019 Andrew Gallant <jamslam@gmail.com> | |
6 | Copyright: 2018-2021 Andrew Gallant <jamslam@gmail.com> | |
7 | 7 | License: Unlicense or MIT |
8 | 8 | |
9 | 9 | Files: debian/* |
10 | 10 | Copyright: |
11 | 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
11 | 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 12 | 2019 Sylvestre Ledru <sylvestre@debian.org> |
13 | 13 | License: Unlicense or MIT |
14 | 14 |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2019-2020 Sylvestre Ledru <sylvestre@debian.org> | |
23 | 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2019-2021 Sylvestre Ledru <sylvestre@debian.org> | |
25 | 25 | License: Unlicense or MIT |
26 | 26 | |
27 | 27 | License: MIT |
0 | 0 | overlay = "." |
1 | 1 | uploaders = ["Sylvestre Ledru <sylvestre@debian.org>"] |
2 | ||
3 | [packages.lib] | |
4 | # some tests require std but they are also configured to run on the no-std feature | |
5 | # there is a proper way to fix it, see the git history of this directory for an | |
6 | # example patch, but it is simply unmaintainable | |
7 | test_is_broken = true | |
8 | ||
9 | [packages."lib+std"] | |
10 | test_is_broken = false |
0 | --- a/src/dense.rs | |
1 | +++ b/src/dense.rs | |
2 | @@ -119,7 +119,7 @@ | |
3 | /// This type implements the [`DFA`](trait.DFA.html) trait, which means it | |
4 | /// can be used for searching. For example: | |
5 | /// | |
6 | -/// ``` | |
7 | +#[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
8 | /// use regex_automata::{DFA, DenseDFA}; | |
9 | /// | |
10 | /// # fn example() -> Result<(), regex_automata::Error> { | |
11 | @@ -502,7 +502,7 @@ | |
12 | /// decrease the size of the DFA and to avoid platform specific pitfalls | |
13 | /// such as differing pointer sizes. | |
14 | /// | |
15 | - /// ``` | |
16 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
17 | /// use regex_automata::{DFA, DenseDFA}; | |
18 | /// | |
19 | /// # fn example() -> Result<(), regex_automata::Error> { | |
20 | @@ -2246,6 +2246,7 @@ | |
21 | String::from_utf8(ascii::escape_default(b).collect::<Vec<_>>()).unwrap() | |
22 | } | |
23 | ||
24 | +#[cfg(feature = "std")] | |
25 | #[cfg(test)] | |
26 | #[allow(dead_code)] | |
27 | mod tests { | |
28 | --- a/tests/tests.rs | |
29 | +++ b/tests/tests.rs | |
30 | @@ -10,7 +10,10 @@ | |
31 | extern crate serde_derive; | |
32 | extern crate toml; | |
33 | ||
34 | +#[cfg(feature = "std")] | |
35 | mod collection; | |
36 | +#[cfg(feature = "std")] | |
37 | mod regression; | |
38 | +#[cfg(feature = "std")] | |
39 | mod suite; | |
40 | mod unescape; | |
41 | --- a/src/dfa.rs | |
42 | +++ b/src/dfa.rs | |
43 | @@ -78,7 +78,7 @@ | |
44 | /// This example shows how to use this method with a | |
45 | /// [`DenseDFA`](enum.DenseDFA.html). | |
46 | /// | |
47 | - /// ``` | |
48 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
49 | /// use regex_automata::{DFA, DenseDFA}; | |
50 | /// | |
51 | /// # fn example() -> Result<(), regex_automata::Error> { | |
52 | @@ -104,7 +104,7 @@ | |
53 | /// This example shows how to use this method with a | |
54 | /// [`DenseDFA`](enum.DenseDFA.html). | |
55 | /// | |
56 | - /// ``` | |
57 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
58 | /// use regex_automata::{DFA, DenseDFA}; | |
59 | /// | |
60 | /// # fn example() -> Result<(), regex_automata::Error> { | |
61 | @@ -153,7 +153,7 @@ | |
62 | /// both `Sam|Samwise` and `Samwise|Sam` match `Samwise` when using | |
63 | /// leftmost longest semantics. | |
64 | /// | |
65 | - /// ``` | |
66 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
67 | /// use regex_automata::{DFA, DenseDFA}; | |
68 | /// | |
69 | /// # fn example() -> Result<(), regex_automata::Error> { | |
70 | @@ -187,7 +187,7 @@ | |
71 | /// `find` and `rfind` with the same DFA since any particular DFA will only | |
72 | /// support searching in one direction. | |
73 | /// | |
74 | - /// ``` | |
75 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
76 | /// use regex_automata::{dense, DFA}; | |
77 | /// | |
78 | /// # fn example() -> Result<(), regex_automata::Error> { | |
79 | --- a/src/lib.rs | |
80 | +++ b/src/lib.rs | |
81 | @@ -29,7 +29,7 @@ | |
82 | This example shows how to compile a regex using the default configuration | |
83 | and then use it to find matches in a byte string: | |
84 | ||
85 | -``` | |
86 | +*/#![cfg_attr(feature = "std", doc = "```")] #![cfg_attr(not(feature = "std"), doc = "```ignore")]/*! | |
87 | use regex_automata::Regex; | |
88 | ||
89 | let re = Regex::new(r"[0-9]{4}-[0-9]{2}-[0-9]{2}").unwrap(); | |
90 | @@ -48,7 +48,7 @@ | |
91 | Using sparse DFAs is as easy as using `Regex::new_sparse` instead of | |
92 | `Regex::new`: | |
93 | ||
94 | -``` | |
95 | +*/#![cfg_attr(feature = "std", doc = "```")] #![cfg_attr(not(feature = "std"), doc = "```ignore")]/*! | |
96 | use regex_automata::Regex; | |
97 | ||
98 | # fn example() -> Result<(), regex_automata::Error> { | |
99 | @@ -62,7 +62,7 @@ | |
100 | If you already have dense DFAs for some reason, they can be converted to sparse | |
101 | DFAs and used to build a new `Regex`. For example: | |
102 | ||
103 | -``` | |
104 | +*/#![cfg_attr(feature = "std", doc = "```")] #![cfg_attr(not(feature = "std"), doc = "```ignore")]/*! | |
105 | use regex_automata::Regex; | |
106 | ||
107 | # fn example() -> Result<(), regex_automata::Error> { | |
108 | @@ -86,7 +86,7 @@ | |
109 | deserialization is guaranteed to be cheap because it will always be a constant | |
110 | time operation. | |
111 | ||
112 | -``` | |
113 | +*/#![cfg_attr(feature = "std", doc = "```")] #![cfg_attr(not(feature = "std"), doc = "```ignore")]/*! | |
114 | use regex_automata::{DenseDFA, Regex}; | |
115 | ||
116 | # fn example() -> Result<(), regex_automata::Error> { | |
117 | @@ -139,7 +139,7 @@ | |
118 | ||
119 | The same process can be achieved with sparse DFAs as well: | |
120 | ||
121 | -``` | |
122 | +*/#![cfg_attr(feature = "std", doc = "```")] #![cfg_attr(not(feature = "std"), doc = "```ignore")]/*! | |
123 | use regex_automata::{SparseDFA, Regex}; | |
124 | ||
125 | # fn example() -> Result<(), regex_automata::Error> { | |
126 | --- a/src/regex.rs | |
127 | +++ b/src/regex.rs | |
128 | @@ -86,7 +86,7 @@ | |
129 | /// enough to build corresponding sparse DFAs, and then build a regex from | |
130 | /// them: | |
131 | /// | |
132 | -/// ``` | |
133 | +#[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
134 | /// use regex_automata::Regex; | |
135 | /// | |
136 | /// # fn example() -> Result<(), regex_automata::Error> { | |
137 | @@ -179,7 +179,7 @@ | |
138 | /// | |
139 | /// # Example | |
140 | /// | |
141 | - /// ``` | |
142 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
143 | /// use regex_automata::Regex; | |
144 | /// | |
145 | /// # fn example() -> Result<(), regex_automata::Error> { | |
146 | @@ -201,7 +201,7 @@ | |
147 | /// | |
148 | /// # Example | |
149 | /// | |
150 | - /// ``` | |
151 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
152 | /// use regex_automata::Regex; | |
153 | /// | |
154 | /// # fn example() -> Result<(), regex_automata::Error> { | |
155 | @@ -235,7 +235,7 @@ | |
156 | /// | |
157 | /// # Example | |
158 | /// | |
159 | - /// ``` | |
160 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
161 | /// use regex_automata::Regex; | |
162 | /// | |
163 | /// # fn example() -> Result<(), regex_automata::Error> { | |
164 | @@ -313,7 +313,7 @@ | |
165 | /// | |
166 | /// # Example | |
167 | /// | |
168 | - /// ``` | |
169 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
170 | /// use regex_automata::Regex; | |
171 | /// | |
172 | /// # fn example() -> Result<(), regex_automata::Error> { | |
173 | @@ -342,7 +342,7 @@ | |
174 | /// would involve serializing `initial_re` somewhere and then deserializing | |
175 | /// it later to build a regex. | |
176 | /// | |
177 | - /// ``` | |
178 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
179 | /// use regex_automata::Regex; | |
180 | /// | |
181 | /// # fn example() -> Result<(), regex_automata::Error> { | |
182 | @@ -358,7 +358,7 @@ | |
183 | /// This example shows how you might build smaller DFAs, and then use those | |
184 | /// smaller DFAs to build a new regex. | |
185 | /// | |
186 | - /// ``` | |
187 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
188 | /// use regex_automata::Regex; | |
189 | /// | |
190 | /// # fn example() -> Result<(), regex_automata::Error> { | |
191 | @@ -375,7 +375,7 @@ | |
192 | /// This example shows how to build a `Regex` that uses sparse DFAs instead | |
193 | /// of dense DFAs: | |
194 | /// | |
195 | - /// ``` | |
196 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
197 | /// use regex_automata::Regex; | |
198 | /// | |
199 | /// # fn example() -> Result<(), regex_automata::Error> { | |
200 | --- a/src/sparse.rs | |
201 | +++ b/src/sparse.rs | |
202 | @@ -86,7 +86,7 @@ | |
203 | /// This type implements the [`DFA`](trait.DFA.html) trait, which means it | |
204 | /// can be used for searching. For example: | |
205 | /// | |
206 | -/// ``` | |
207 | +#[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
208 | /// use regex_automata::{DFA, SparseDFA}; | |
209 | /// | |
210 | /// # fn example() -> Result<(), regex_automata::Error> { | |
211 | @@ -393,7 +393,7 @@ | |
212 | /// decrease the size of the DFA and to avoid platform specific pitfalls | |
213 | /// such as differing pointer sizes. | |
214 | /// | |
215 | - /// ``` | |
216 | + #[cfg_attr(feature = "std", doc = "```")] #[cfg_attr(not(feature = "std"), doc = "```ignore")] | |
217 | /// use regex_automata::{DFA, DenseDFA, SparseDFA}; | |
218 | /// | |
219 | /// # fn example() -> Result<(), regex_automata::Error> { |
0 | rust-unicode-bidi (0.3.7-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package unicode-bidi 0.3.7 from crates.io using debcargo 2.4.4 | |
4 | ||
5 | -- Ximin Luo <infinity0@debian.org> Sat, 23 Oct 2021 21:53:53 +0100 | |
6 | ||
0 | 7 | rust-unicode-bidi (0.3.4-2) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Package unicode-bidi 0.3.4 from crates.io using debcargo 2.2.7 |
8 | 8 | |
9 | 9 | Files: debian/* |
10 | 10 | Copyright: |
11 | 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
11 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 12 | 2018 Paride Legovini <paride@debian.org> |
13 | 13 | License: MIT or Apache-2.0 |
14 | 14 |
83 | 83 | |
84 | 84 | Files: debian/* |
85 | 85 | Copyright: |
86 | 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
87 | 2018 Paride Legovini <pl@ninthfloor.org> | |
88 | 2018 kpcyrd <git@rxv.cc> | |
86 | 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
87 | 2018-2021 Paride Legovini <paride@debian.org> | |
88 | 2018-2021 kpcyrd <git@rxv.cc> | |
89 | 89 | License: MIT or Apache-2.0 |
90 | 90 | |
91 | 91 | License: Apache-2.0 |
0 | --- a/Cargo.toml 2017-07-06 23:45:07.000000000 +0000 | |
1 | +++ b/Cargo.toml 2018-09-15 18:09:13.913086470 +0000 | |
2 | @@ -23,13 +23,6 @@ | |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -25,13 +25,6 @@ | |
3 | 3 | |
4 | 4 | [lib] |
5 | 5 | name = "unicode_bidi" |
6 | 6 | -[dependencies.flame] |
7 | -version = "0.1" | |
7 | -version = "0.2" | |
8 | 8 | -optional = true |
9 | 9 | - |
10 | 10 | -[dependencies.flamer] |
11 | -version = "0.1" | |
11 | -version = "0.4" | |
12 | 12 | -optional = true |
13 | 13 | |
14 | [dependencies.matches] | |
15 | version = "0.1" | |
16 | @@ -44,6 +37,5 @@ | |
14 | [dependencies.serde] | |
15 | version = ">=0.8, <2.0" | |
16 | @@ -44,7 +37,6 @@ | |
17 | 17 | [features] |
18 | 18 | bench_it = [] |
19 | default = [] | |
19 | default = ["std"] | |
20 | 20 | -flame_it = ["flame", "flamer"] |
21 | std = [] | |
21 | 22 | unstable = [] |
22 | 23 | with_serde = ["serde"] |