mirror of
				https://gitlab.alpinelinux.org/alpine/aports.git
				synced 2025-10-31 08:21:49 +01:00 
			
		
		
		
	
		
			
				
	
	
		
			230 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			230 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| Fix build on 32-bit archs by updating pprof-rs from 0.10.1 to 0.11.1.
 | |
| Ref: https://github.com/tikv/pprof-rs/commit/09c0e73ab29cd2f586d0502397b3ea96ac8b2171
 | |
| 
 | |
| diff --git a/Cargo.lock b/Cargo.lock
 | |
| index 2f76061..e4917b6 100644
 | |
| --- a/Cargo.lock
 | |
| +++ b/Cargo.lock
 | |
| @@ -68,7 +68,7 @@ dependencies = [
 | |
|   "cipher",
 | |
|   "console",
 | |
|   "cookie-factory",
 | |
| - "criterion",
 | |
| + "criterion 0.3.6",
 | |
|   "criterion-cycles-per-byte",
 | |
|   "ctr",
 | |
|   "curve25519-dalek",
 | |
| @@ -168,6 +168,12 @@ dependencies = [
 | |
|   "libc",
 | |
|  ]
 | |
|  
 | |
| +[[package]]
 | |
| +name = "anes"
 | |
| +version = "0.1.6"
 | |
| +source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 | |
| +
 | |
|  [[package]]
 | |
|  name = "arc-swap"
 | |
|  version = "1.6.0"
 | |
| @@ -401,6 +407,33 @@ dependencies = [
 | |
|   "winapi",
 | |
|  ]
 | |
|  
 | |
| +[[package]]
 | |
| +name = "ciborium"
 | |
| +version = "0.2.1"
 | |
| +source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
 | |
| +dependencies = [
 | |
| + "ciborium-io",
 | |
| + "ciborium-ll",
 | |
| + "serde",
 | |
| +]
 | |
| +
 | |
| +[[package]]
 | |
| +name = "ciborium-io"
 | |
| +version = "0.2.1"
 | |
| +source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
 | |
| +
 | |
| +[[package]]
 | |
| +name = "ciborium-ll"
 | |
| +version = "0.2.1"
 | |
| +source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
 | |
| +dependencies = [
 | |
| + "ciborium-io",
 | |
| + "half",
 | |
| +]
 | |
| +
 | |
|  [[package]]
 | |
|  name = "cipher"
 | |
|  version = "0.4.4"
 | |
| @@ -494,9 +527,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 | |
|  
 | |
|  [[package]]
 | |
|  name = "cpp_demangle"
 | |
| -version = "0.3.5"
 | |
| +version = "0.4.1"
 | |
|  source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
 | |
| +checksum = "2c76f98bdfc7f66172e6c7065f981ebb576ffc903fe4c0561d9f0c2509226dc6"
 | |
|  dependencies = [
 | |
|   "cfg-if",
 | |
|  ]
 | |
| @@ -528,7 +561,7 @@ dependencies = [
 | |
|   "atty",
 | |
|   "cast",
 | |
|   "clap 2.34.0",
 | |
| - "criterion-plot",
 | |
| + "criterion-plot 0.4.5",
 | |
|   "csv",
 | |
|   "itertools",
 | |
|   "lazy_static",
 | |
| @@ -545,13 +578,39 @@ dependencies = [
 | |
|   "walkdir",
 | |
|  ]
 | |
|  
 | |
| +[[package]]
 | |
| +name = "criterion"
 | |
| +version = "0.4.0"
 | |
| +source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
 | |
| +dependencies = [
 | |
| + "anes",
 | |
| + "atty",
 | |
| + "cast",
 | |
| + "ciborium",
 | |
| + "clap 3.2.25",
 | |
| + "criterion-plot 0.5.0",
 | |
| + "itertools",
 | |
| + "lazy_static",
 | |
| + "num-traits",
 | |
| + "oorandom",
 | |
| + "plotters",
 | |
| + "rayon",
 | |
| + "regex",
 | |
| + "serde",
 | |
| + "serde_derive",
 | |
| + "serde_json",
 | |
| + "tinytemplate",
 | |
| + "walkdir",
 | |
| +]
 | |
| +
 | |
|  [[package]]
 | |
|  name = "criterion-cycles-per-byte"
 | |
|  version = "0.1.3"
 | |
|  source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
|  checksum = "07175eab62c9054f8828955f9a84ddd3f732f796ee99fb4898453d60be4bcbdc"
 | |
|  dependencies = [
 | |
| - "criterion",
 | |
| + "criterion 0.3.6",
 | |
|  ]
 | |
|  
 | |
|  [[package]]
 | |
| @@ -564,6 +623,16 @@ dependencies = [
 | |
|   "itertools",
 | |
|  ]
 | |
|  
 | |
| +[[package]]
 | |
| +name = "criterion-plot"
 | |
| +version = "0.5.0"
 | |
| +source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 | |
| +dependencies = [
 | |
| + "cast",
 | |
| + "itertools",
 | |
| +]
 | |
| +
 | |
|  [[package]]
 | |
|  name = "crossbeam-channel"
 | |
|  version = "0.5.8"
 | |
| @@ -655,7 +724,7 @@ version = "3.3.1"
 | |
|  source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
|  checksum = "7394a21d012ce5c850497fb774b167d81b99f060025fbf06ee92b9848bd97eb2"
 | |
|  dependencies = [
 | |
| - "nix 0.26.2",
 | |
| + "nix",
 | |
|   "windows-sys 0.48.0",
 | |
|  ]
 | |
|  
 | |
| @@ -1496,17 +1565,6 @@ dependencies = [
 | |
|   "adler",
 | |
|  ]
 | |
|  
 | |
| -[[package]]
 | |
| -name = "nix"
 | |
| -version = "0.24.3"
 | |
| -source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 | |
| -dependencies = [
 | |
| - "bitflags",
 | |
| - "cfg-if",
 | |
| - "libc",
 | |
| -]
 | |
| -
 | |
|  [[package]]
 | |
|  name = "nix"
 | |
|  version = "0.26.2"
 | |
| @@ -1857,18 +1915,18 @@ dependencies = [
 | |
|  
 | |
|  [[package]]
 | |
|  name = "pprof"
 | |
| -version = "0.10.1"
 | |
| +version = "0.11.1"
 | |
|  source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| -checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f"
 | |
| +checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059"
 | |
|  dependencies = [
 | |
|   "backtrace",
 | |
|   "cfg-if",
 | |
| - "criterion",
 | |
| + "criterion 0.4.0",
 | |
|   "findshlibs",
 | |
|   "inferno",
 | |
|   "libc",
 | |
|   "log",
 | |
| - "nix 0.24.3",
 | |
| + "nix",
 | |
|   "once_cell",
 | |
|   "parking_lot",
 | |
|   "smallvec",
 | |
| @@ -2419,9 +2477,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 | |
|  
 | |
|  [[package]]
 | |
|  name = "symbolic-common"
 | |
| -version = "9.2.1"
 | |
| +version = "10.2.1"
 | |
|  source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| -checksum = "800963ba330b09a2ae4a4f7c6392b81fbc2784099a98c1eac68c3437aa9382b2"
 | |
| +checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737"
 | |
|  dependencies = [
 | |
|   "debugid",
 | |
|   "memmap2",
 | |
| @@ -2431,9 +2489,9 @@ dependencies = [
 | |
|  
 | |
|  [[package]]
 | |
|  name = "symbolic-demangle"
 | |
| -version = "9.2.1"
 | |
| +version = "10.2.1"
 | |
|  source = "registry+https://github.com/rust-lang/crates.io-index"
 | |
| -checksum = "2b940a1fdbc72bb3369e38714efe6cd332dbbe46d093cf03d668b9ac390d1ad0"
 | |
| +checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489"
 | |
|  dependencies = [
 | |
|   "cpp_demangle",
 | |
|   "rustc-demangle",
 | |
| diff --git a/age/Cargo.toml b/age/Cargo.toml
 | |
| index 63ec0a5..ed0e577 100644
 | |
| --- a/age/Cargo.toml
 | |
| +++ b/age/Cargo.toml
 | |
| @@ -102,7 +102,7 @@ test-case = "2"
 | |
|  tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 | |
|  
 | |
|  [target.'cfg(unix)'.dev-dependencies]
 | |
| -pprof = { version = "0.10", features = ["criterion", "flamegraph"] }
 | |
| +pprof = { version = "0.11.1", features = ["criterion", "flamegraph"] }
 | |
|  
 | |
|  [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dev-dependencies]
 | |
|  criterion-cycles-per-byte = "0.1"
 |