Codebase list rust-libslirp / d556cbc
update other deps of cargo Ximin Luo 3 years ago
17 changed file(s) with 115 addition(s) and 203 deletion(s). Raw diff Collapse all Expand all
+6
-0
src/autocfg/debian/changelog less more
0 rust-autocfg (1.0.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Package autocfg 1.0.1 from crates.io using debcargo 2.4.3
3
4 -- Ximin Luo <infinity0@debian.org> Thu, 01 Oct 2020 22:19:25 +0100
5
06 rust-autocfg (1.0.0-2) unstable; urgency=medium
17
28 * Team upload.
+0
-1
src/autocfg/debian/patches/series less more
0 use-tests-target-dir-envvar.diff
+0
-124
src/autocfg/debian/patches/use-tests-target-dir-envvar.diff less more
0 Description: Use TESTS_TARGET_DIR envvar to override tests target dir
1 Rationale: At Debian, the autopkgtests are run inside a non-writable
2 directory, so the "target" subdirectory can't be used. Inside the
3 autopkgtest environment, we have an env variable AUTOPKGTEST_TMP
4 available which points to a temporary directory, that we can pass on to
5 the tests as TESTS_TARGET_DIR. This makes the tests pass properly inside
6 this environment.
7 Author: Wolfgang Silbermayr <wolfgang@silbermayr.at>
8 Forwarded: https://github.com/cuviper/autocfg/pull/22
9 Last-Update: 2020-02-18
10 ---
11 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
12 --- a/src/tests.rs
13 +++ b/src/tests.rs
14 @@ -1,4 +1,5 @@
15 use super::AutoCfg;
16 +use std::env;
17
18 impl AutoCfg {
19 fn core_std(&self, path: &str) -> String {
20 @@ -13,11 +14,18 @@
21 fn assert_min(&self, major: usize, minor: usize, probe_result: bool) {
22 assert_eq!(self.probe_rustc_version(major, minor), probe_result);
23 }
24 +
25 + fn for_test() -> Result<Self, super::error::Error> {
26 + match env::var_os("TESTS_TARGET_DIR") {
27 + Some(d) => Self::with_dir(d),
28 + None => Self::with_dir("target"),
29 + }
30 + }
31 }
32
33 #[test]
34 fn autocfg_version() {
35 - let ac = AutoCfg::with_dir("target").unwrap();
36 + let ac = AutoCfg::for_test().unwrap();
37 println!("version: {:?}", ac.rustc_version);
38 assert!(ac.probe_rustc_version(1, 0));
39 }
40 @@ -37,7 +45,7 @@
41
42 #[test]
43 fn probe_add() {
44 - let ac = AutoCfg::with_dir("target").unwrap();
45 + let ac = AutoCfg::for_test().unwrap();
46 let add = ac.core_std("ops::Add");
47 let add_rhs = add.clone() + "<i32>";
48 let add_rhs_output = add.clone() + "<i32, Output = i32>";
49 @@ -51,7 +59,7 @@
50
51 #[test]
52 fn probe_as_ref() {
53 - let ac = AutoCfg::with_dir("target").unwrap();
54 + let ac = AutoCfg::for_test().unwrap();
55 let as_ref = ac.core_std("convert::AsRef");
56 let as_ref_str = as_ref.clone() + "<str>";
57 let dyn_as_ref_str = "dyn ".to_string() + &*as_ref_str;
58 @@ -63,7 +71,7 @@
59
60 #[test]
61 fn probe_i128() {
62 - let ac = AutoCfg::with_dir("target").unwrap();
63 + let ac = AutoCfg::for_test().unwrap();
64 let i128_path = ac.core_std("i128");
65 ac.assert_min(1, 26, ac.probe_path(&i128_path));
66 ac.assert_min(1, 26, ac.probe_type("i128"));
67 @@ -71,7 +79,7 @@
68
69 #[test]
70 fn probe_sum() {
71 - let ac = AutoCfg::with_dir("target").unwrap();
72 + let ac = AutoCfg::for_test().unwrap();
73 let sum = ac.core_std("iter::Sum");
74 let sum_i32 = sum.clone() + "<i32>";
75 let dyn_sum_i32 = "dyn ".to_string() + &*sum_i32;
76 @@ -84,25 +92,25 @@
77
78 #[test]
79 fn probe_std() {
80 - let ac = AutoCfg::with_dir("target").unwrap();
81 + let ac = AutoCfg::for_test().unwrap();
82 ac.assert_std(ac.probe_sysroot_crate("std"));
83 }
84
85 #[test]
86 fn probe_alloc() {
87 - let ac = AutoCfg::with_dir("target").unwrap();
88 + let ac = AutoCfg::for_test().unwrap();
89 ac.assert_min(1, 36, ac.probe_sysroot_crate("alloc"));
90 }
91
92 #[test]
93 fn probe_bad_sysroot_crate() {
94 - let ac = AutoCfg::with_dir("target").unwrap();
95 + let ac = AutoCfg::for_test().unwrap();
96 assert!(!ac.probe_sysroot_crate("doesnt_exist"));
97 }
98
99 #[test]
100 fn probe_no_std() {
101 - let ac = AutoCfg::with_dir("target").unwrap();
102 + let ac = AutoCfg::for_test().unwrap();
103 assert!(ac.probe_type("i32"));
104 assert!(ac.probe_type("[i32]"));
105 ac.assert_std(ac.probe_type("Vec<i32>"));
106 @@ -110,7 +118,7 @@
107
108 #[test]
109 fn probe_expression() {
110 - let ac = AutoCfg::with_dir("target").unwrap();
111 + let ac = AutoCfg::for_test().unwrap();
112 assert!(ac.probe_expression(r#""test".trim_left()"#));
113 ac.assert_min(1, 30, ac.probe_expression(r#""test".trim_start()"#));
114 ac.assert_std(ac.probe_expression("[1, 2, 3].to_vec()"));
115 @@ -118,7 +126,7 @@
116
117 #[test]
118 fn probe_constant() {
119 - let ac = AutoCfg::with_dir("target").unwrap();
120 + let ac = AutoCfg::for_test().unwrap();
121 assert!(ac.probe_constant("1 + 2 + 3"));
122 ac.assert_min(1, 33, ac.probe_constant("{ let x = 1 + 2 + 3; x * x }"));
123 ac.assert_min(1, 39, ac.probe_constant(r#""test".len()"#));
+2
-2
src/autocfg/debian/tests/control less more
0 Test-Command: TESTS_TARGET_DIR=${AUTOPKGTEST_TMP} /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.0 --all-targets --all-features
0 Test-Command: TESTS_TARGET_DIR=${AUTOPKGTEST_TMP} /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.1 --all-targets --all-features
11 Features: test-name=@
22 Depends: dh-cargo (>= 18), @
33 Restrictions: allow-stderr, skip-not-installable
44
5 Test-Command: TESTS_TARGET_DIR=${AUTOPKGTEST_TMP} /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.0 --all-targets --no-default-features
5 Test-Command: TESTS_TARGET_DIR=${AUTOPKGTEST_TMP} /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.1 --all-targets --no-default-features
66 Features: test-name=librust-autocfg-dev
77 Depends: dh-cargo (>= 18), @
88 Restrictions: allow-stderr, skip-not-installable
+2
-2
src/autocfg/debian/tests/control.debcargo.hint less more
0 Test-Command: /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.0 --all-targets --all-features
0 Test-Command: /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.1 --all-targets --all-features
11 Features: test-name=@
22 Depends: dh-cargo (>= 18), @
33 Restrictions: allow-stderr, skip-not-installable
44
5 Test-Command: /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.0 --all-targets --no-default-features
5 Test-Command: /usr/share/cargo/bin/cargo-auto-test autocfg 1.0.1 --all-targets --no-default-features
66 Features: test-name=librust-autocfg-dev
77 Depends: dh-cargo (>= 18), @
88 Restrictions: allow-stderr, skip-not-installable
+7
-0
src/lazycell/debian/changelog less more
0 rust-lazycell (1.3.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Team upload.
3 * Package lazycell 1.3.0 from crates.io using debcargo 2.4.3
4
5 -- Ximin Luo <infinity0@debian.org> Thu, 01 Oct 2020 22:20:02 +0100
6
07 rust-lazycell (1.2.1-1) unstable; urgency=medium
18
29 * Package lazycell 1.2.1 from crates.io using debcargo 2.2.9
+4
-4
src/lazycell/debian/copyright less more
77 Files: *
88 Copyright:
99 2014 The Rust Project Developers
10 2016-2018 Nikita Pekin
11 2016-2018 The lazycell contributors
10 2016-2020 Nikita Pekin
11 2016-2020 The lazycell contributors
1212 License: MIT or Apache-2.0
1313
1414 Files: debian/*
1515 Copyright:
16 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
17 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
16 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
17 2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
1818 License: MIT or Apache-2.0
1919
2020 License: Apache-2.0
+11
-4
src/lazycell/debian/copyright.debcargo.hint less more
2727 Files: ./src/lib.rs
2828 Copyright:
2929 2014 The Rust Project Developers
30 2016-2018 Nikita Pekin and the lazycell contributors
30 2016-2020 Nikita Pekin and the lazycell contributors
31 License: UNKNOWN-LICENSE; FIXME (overlay)
32 Comment:
33 FIXME (overlay): These notices are extracted from files. Please review them
34 before uploading to the archive.
35
36 Files: ./src/serde_impl.rs
37 Copyright: 2020 Nikita Pekin and the lazycell contributors
3138 License: UNKNOWN-LICENSE; FIXME (overlay)
3239 Comment:
3340 FIXME (overlay): These notices are extracted from files. Please review them
3542
3643 Files: debian/*
3744 Copyright:
38 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
39 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
40 2018 kpcyrd <git@rxv.cc>
45 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
46 2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
47 2018-2020 kpcyrd <git@rxv.cc>
4148 License: MIT or Apache-2.0
4249
4350 License: Apache-2.0
+0
-11
src/lazycell/debian/patches/no-clippy.patch less more
0 --- a/Cargo.toml
1 +++ b/Cargo.toml
2 @@ -23,8 +23 @@ license = "MIT/Apache-2.0"
3 repository = "https://github.com/indiv0/lazycell"
4 -[dependencies.clippy]
5 -version = "0.0"
6 -optional = true
7 -
8 -[features]
9 -nightly = []
10 -nightly-testing = ["clippy", "nightly"]
+0
-1
src/lazycell/debian/patches/series less more
0 no-clippy.patch
+5
-2
src/pkg-config/debian/changelog less more
0 rust-pkg-config (0.3.17-4) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
0 rust-pkg-config (0.3.18-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
11
2 * Package pkg-config 0.3.18 from crates.io using debcargo 2.4.3
3
4 [ Sylvestre Ledru ]
25 * Team upload.
36 * Package pkg-config 0.3.17 from crates.io using debcargo 2.4.2
47 * Disable one more test
58
6 -- Sylvestre Ledru <sylvestre@debian.org> Sun, 12 Apr 2020 14:23:49 +0200
9 -- Ximin Luo <infinity0@debian.org> Thu, 01 Oct 2020 22:27:03 +0100
710
811 rust-pkg-config (0.3.17-3) unstable; urgency=medium
912
+9
-11
src/pkg-config/debian/patches/debian-auto-cross-compile.patch less more
00 --- a/src/lib.rs
11 +++ b/src/lib.rs
2 @@ -385,9 +385,11 @@
3 }
4
2 @@ -399,7 +389,11 @@ impl Config {
53 fn command(&self, name: &str, args: &[&str]) -> Command {
6 - let exe = self
7 - .env_var("PKG_CONFIG")
8 - .unwrap_or_else(|_| String::from("pkg-config"));
9 + let exe = self.env_var("PKG_CONFIG").unwrap_or_else(|_| {
10 + self.env_var("DEB_HOST_GNU_TYPE")
11 + .map(|t| t.to_string() + "-pkg-config")
12 + .unwrap_or_else(|_| String::from("pkg-config"))
13 + });
4 let exe = self
5 .env_var_os("PKG_CONFIG")
6 - .unwrap_or_else(|| OsString::from("pkg-config"));
7 + .unwrap_or_else(|| {
8 + self.env_var_os("DEB_HOST_GNU_TYPE")
9 + .map(|mut t| { t.push(OsString::from("-pkg-config")); t })
10 + .unwrap_or_else(|| OsString::from("pkg-config"))
11 + });
1412 let mut cmd = Command::new(exe);
1513 if self.is_static(name) {
1614 cmd.arg("--static");
+55
-32
src/pkg-config/debian/patches/no-special-snowflake-env.patch less more
0 --- a/tests/test.rs
1 +++ b/tests/test.rs
2 @@ -34,7 +34,6 @@
3 pkg_config::probe_library(name)
4 }
5
6 -#[test]
7 fn cross_disabled() {
8 let _g = LOCK.lock();
9 reset();
10 @@ -46,7 +45,6 @@
11 }
12 }
13
14 -#[test]
15 fn cross_enabled() {
16 let _g = LOCK.lock();
17 reset();
180 --- a/src/lib.rs
191 +++ b/src/lib.rs
202 @@ -9,8 +9,6 @@
268 //! * `FOO_NO_PKG_CONFIG` - if set, this will disable running `pkg-config` when
279 //! probing for the library named `foo`.
2810 //!
29 @@ -344,17 +342,7 @@
11 @@ -106,9 +104,8 @@ pub enum Error {
12 /// Contains the name of the responsible environment variable.
13 EnvNoPkgConfig(String),
14
15 - /// Cross compilation detected.
16 - ///
17 - /// Override with `PKG_CONFIG_ALLOW_CROSS=1`.
18 + /// Cross compilation detected. Kept for compatibility;
19 + /// the Debian package never emits this.
20 CrossCompilation,
21
22 /// Failed to run `pkg-config`.
23 @@ -152,11 +145,6 @@ impl fmt::Display for Error {
24 fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
25 match *self {
26 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"
31 - ),
32 Error::Command {
33 ref command,
34 ref cause,
35 @@ -180,7 +168,7 @@ impl fmt::Display for Error {
36 }
37 Ok(())
38 }
39 - Error::__Nonexhaustive => panic!(),
40 + Error::CrossCompilation | Error::__Nonexhaustive => panic!(),
41 }
42 }
43 }
44 @@ -341,6 +329,8 @@ impl Config {
45 if host == target {
46 return true;
47 }
48 + // always enable PKG_CONFIG_ALLOW_CROSS override in Debian
49 + return true;
3050
3151 // pkg-config may not be aware of cross-compilation, and require
3252 // a wrapper script that sets up platform-specific prefixes.
33 - match self.targetted_env_var("PKG_CONFIG_ALLOW_CROSS") {
34 - // don't use pkg-config if explicitly disabled
35 - Ok(ref val) if val == "0" => false,
36 - Ok(_) => true,
37 - Err(_) => {
38 - // if not disabled, and pkg-config is customized,
39 - // then assume it's prepared for cross-compilation
40 - self.targetted_env_var("PKG_CONFIG").is_ok()
41 - || self.targetted_env_var("PKG_CONFIG_SYSROOT_DIR").is_ok()
42 - }
43 - }
44 + true
53 --- a/tests/test.rs
54 +++ b/tests/test.rs
55 @@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config
56 pkg_config::probe_library(name)
57 }
58
59 -#[test]
60 fn cross_disabled() {
61 let _g = LOCK.lock();
62 reset();
63 @@ -46,7 +45,6 @@ fn cross_disabled() {
4564 }
65 }
4666
47 /// Deprecated in favor of the top level `get_variable` function
67 -#[test]
68 fn cross_enabled() {
69 let _g = LOCK.lock();
70 reset();
+5
-2
src/redox-syscall/debian/changelog less more
0 rust-redox-syscall (0.1.56-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
0 rust-redox-syscall (0.2.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
11
2 * Package redox_syscall 0.2.1 from crates.io using debcargo 2.4.3
3
4 [ Niklas Claesson ]
25 * Team upload.
36 * Package redox_syscall 0.1.56 from crates.io using debcargo 2.2.10
47
5 -- Niklas Claesson <nicke.claesson@gmail.com> Sun, 7 Jul 2019 16:13:24 +0200
8 -- Ximin Luo <infinity0@debian.org> Thu, 01 Oct 2020 22:29:44 +0100
69
710 rust-redox-syscall (0.1.40-2) unstable; urgency=medium
811
+2
-2
src/redox-syscall/debian/copyright less more
1010
1111 Files: debian/*
1212 Copyright:
13 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
14 2018-2019 kpcyrd <git@rxv.cc>
13 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
14 2018-2020 kpcyrd <git@rxv.cc>
1515 License: MIT
1616
1717 License: MIT
+2
-2
src/redox-syscall/debian/copyright.debcargo.hint less more
2020
2121 Files: debian/*
2222 Copyright:
23 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
24 2018-2019 kpcyrd <git@rxv.cc>
23 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
24 2018-2020 kpcyrd <git@rxv.cc>
2525 License: MIT
2626
2727 License: MIT
+5
-3
src/redox-syscall/debian/patches/no-nightly.patch less more
1616 index 6b8d130..42526f0 100644
1717 --- a/src/lib.rs
1818 +++ b/src/lib.rs
19 @@ -1,5 +1,5 @@
19 @@ -1,6 +1,6 @@
2020 -#![feature(asm)]
21 -#![feature(const_fn)]
21 -#![feature(llvm_asm)]
22 -#![feature(const_fn)] // see https://github.com/rust-lang/rfcs/pull/2632
2223 +#![cfg_attr(nightly, feature(asm))]
23 +#![cfg_attr(nightly, feature(const_fn))]
24 +#![cfg_attr(nightly, feature(llvm_asm))]
25 +#![cfg_attr(nightly, feature(const_fn))] // see https://github.com/rust-lang/rfcs/pull/2632
2426 #![cfg_attr(not(test), no_std)]
2527
2628 #[cfg(test)]