tree 3f33d06affdf0192ee0e03ee27e73dfadd661327
parent fff997dda0625bd6f7c33bc0d79653c91b41b6c7
parent 488b3adc2f26d150def93949d51cfdd37528a37d
author Daniel Verkamp <dverkamp@chromium.org> 1630437550 -0700
committer Daniel Verkamp <dverkamp@chromium.org> 1630437757 -0700

Merge remote-tracking branch 'upstream/master' into HEAD

Pull in warning fixes for Rust 1.53+.

BUG=None
TEST=cargo test --all-features

Change-Id: Idd7a8d5bceee304e7667c62e0f878c373ea47929