Skip to content

Commit 9eba4b9

Browse files
committed
Update to rust master
1 parent 7c62208 commit 9eba4b9

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed

Cargo.lock

Lines changed: 58 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/git.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ fn commit_and_push(repo: &git2::Repository,
232232

233233
// Ok, we need to update, so fetch and reset --hard
234234
try!(origin.add_fetch("refs/heads/*:refs/heads/*"));
235-
try!(origin.fetch(None, None));
235+
try!(origin.fetch(&[], None, None));
236236
let head = try!(repo.head()).target().unwrap();
237237
let obj = try!(repo.find_object(head, None));
238238
try!(repo.reset(&obj, git2::ResetType::Hard, None, None));

src/tests/krate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ fn new_krate_git_upload() {
399399
let p: GitCrate = json::decode(contents.as_slice()).unwrap();
400400
assert_eq!(p.name.as_slice(), "foo");
401401
assert_eq!(p.vers.as_slice(), "1.0.0");
402-
assert_eq!(p.deps.as_slice(), [].as_slice());
402+
assert!(p.deps.is_empty());
403403
assert_eq!(p.cksum.as_slice(),
404404
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
405405
}
@@ -426,10 +426,10 @@ fn new_krate_git_upload_appends() {
426426
assert!(lines.next().is_none());
427427
assert_eq!(p1.name.as_slice(), "foo");
428428
assert_eq!(p1.vers.as_slice(), "0.0.1");
429-
assert_eq!(p1.deps.as_slice(), [].as_slice());
429+
assert!(p1.deps.is_empty());
430430
assert_eq!(p2.name.as_slice(), "foo");
431431
assert_eq!(p2.vers.as_slice(), "1.0.0");
432-
assert_eq!(p2.deps.as_slice(), [].as_slice());
432+
assert!(p2.deps.is_empty());
433433
}
434434

435435
#[test]

0 commit comments

Comments
 (0)