History

Merge branch 'dependabot/cargo/crc-2.0.0'

Sebastian Thiel committed 5 years ago

Commit 683c44d2 parents 3286e42 48fa9bc3 files · +15 −17Browse files

Unified · Split

3 files
  1. Cargo.lock +9 −9
  2. tests/tools/Cargo.toml +1 −1
  3. tests/tools/src/lib.rs +5 −7
Cargo.lock+9−9
@@ -293,12 +293,6 @@ dependencies = [ · 292 unmodified lines
293 "num-traits",293 "num-traits",
294]294]
295 295
296[[package]]
297name = "build_const"
298version = "0.2.2"
299source = "registry+https://github.com/rust-lang/crates.io-index"
300checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7"
301
302[[package]]296[[package]]
303name = "bumpalo"297name = "bumpalo"
304version = "3.7.0"298version = "3.7.0"
@@ -454,13 +448,19 @@ dependencies = [ · 149 unmodified lines
454 448
455[[package]]449[[package]]
456name = "crc"450name = "crc"
457version = "1.8.1"451version = "2.0.0"
458source = "registry+https://github.com/rust-lang/crates.io-index"452source = "registry+https://github.com/rust-lang/crates.io-index"
459checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"453checksum = "10c2722795460108a7872e1cd933a85d6ec38abc4baecad51028f702da28889f"
460dependencies = [454dependencies = [
461 "build_const",455 "crc-catalog",
462]456]
463 457
458[[package]]
459name = "crc-catalog"
460version = "1.1.1"
461source = "registry+https://github.com/rust-lang/crates.io-index"
462checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
463
464[[package]]464[[package]]
465name = "crc32fast"465name = "crc32fast"
466version = "1.2.1"466version = "1.2.1"
tests/tools/Cargo.toml+1−1
@@ -15,6 +15,6 @@ path = "src/main.rs" · 14 unmodified lines
15[dependencies]15[dependencies]
16git-hash = { version = "^0.4.0", path = "../../git-hash" }16git-hash = { version = "^0.4.0", path = "../../git-hash" }
17bstr = "0.2.15"17bstr = "0.2.15"
18crc = "1.8.1"18crc = "2.0.0"
19once_cell = "1.7.2"19once_cell = "1.7.2"
20tempfile = "3.2.0"20tempfile = "3.2.0"
tests/tools/src/lib.rs+5−7
@@ -31,15 +31,13 @@ pub fn scripted_fixture_repo_read_only_with_args( · 30 unmodified lines
31 let script_identity = map31 let script_identity = map
32 .entry(args.iter().fold(script_path.clone(), |p, a| p.join(a)))32 .entry(args.iter().fold(script_path.clone(), |p, a| p.join(a)))
33 .or_insert_with(|| {33 .or_insert_with(|| {
34 let mut crc_value = crc::crc32::update(34 let crc_value = crc::Crc::<u32>::new(&crc::CRC_32_CKSUM);
35 0,35 let mut crc_digest = crc_value.digest();
36 &crc::crc32::IEEE_TABLE,36 crc_digest.update(&std::fs::read(&script_path).expect("file can be read entirely"));
37 &std::fs::read(&script_path).expect("file can be read entirely"),
38 );
39 for arg in args.iter() {37 for arg in args.iter() {
40 crc_value = crc::crc32::update(crc_value, &crc::crc32::IEEE_TABLE, arg.as_bytes());38 crc_digest.update(arg.as_bytes());
41 }39 }
42 crc_value40 crc_digest.finalize()
43 })41 })
44 .to_owned();42 .to_owned();
45 let script_result_directory = fixture_path(43 let script_result_directory = fixture_path(