Upstream merge

Cargo.toml

@@ -18,7 +18,7 @@ categories = ["api-bindings", "network-programming", "database-implementations"]
 license = "MIT/Apache-2.0"
 
 [badges]
-travis-ci = { repository = "jonhoo/msql-srv" }
+azure-devops = { project = "jonhoo/jonhoo", pipeline = "msql-srv", build = "27" }
 codecov = { repository = "jonhoo/msql-srv", branch = "master", service = "github" }
 maintenance = { status = "experimental" }
 

README.md

@@ -2,8 +2,9 @@
 
 [![Crates.io](https://img.shields.io/crates/v/msql_srv.svg)](https://crates.io/crates/msql_srv)
 [![Documentation](https://docs.rs/msql-srv/badge.svg)](https://docs.rs/msql-srv/)
-[![Build Status](https://travis-ci.com/jonhoo/msql-srv.svg?branch=master)](https://travis-ci.com/jonhoo/msql-srv)
+[![Build Status](https://dev.azure.com/jonhoo/jonhoo/_apis/build/status/msql-srv?branchName=master)](https://dev.azure.com/jonhoo/jonhoo/_build/latest?definitionId=27&branchName=master)
 [![Codecov](https://codecov.io/github/jonhoo/msql-srv/coverage.svg?branch=master)](https://codecov.io/gh/jonhoo/msql-srv)
+![Maintenance](https://img.shields.io/badge/maintenance-experimental-blue.svg)
 
 Bindings for emulating a MySQL/MariaDB server.
 
@@ -22,6 +23,7 @@ all commands with a "no results" reply:
 ```rust
 extern crate mysql;
 use msql_srv::*;
+use mysql::prelude::*;
 
 struct Backend;
 impl<W: io::Write> MysqlShim<W> for Backend {
@@ -77,7 +79,7 @@ fn main() {
 
     let mut db = mysql::Conn::new(&format!("mysql://127.0.0.1:{}", port)).unwrap();
     assert_eq!(db.ping(), true);
-    assert_eq!(db.query("SELECT a, b FROM foo").unwrap().count(), 1);
+    assert_eq!(db.query_iter("SELECT a, b FROM foo").unwrap().count(), 1);
     drop(db);
     jh.join().unwrap();
 }

azure-pipelines.yml

@@ -0,0 +1,15 @@
+jobs:
+ - template: default.yml@templates
+   parameters:
+     minrust: 1.39.0 # bytes
+     # re-enable coverage when we're on a newer version of time:
+     # https://github.com/time-rs/time/pull/265
+     # codecov_token: $(CODECOV_TOKEN_SECRET)
+
+resources:
+  repositories:
+    - repository: templates
+      type: github
+      name: crate-ci/azure-pipelines
+      ref: refs/heads/v0.4
+      endpoint: jonhoo

src/packet.rs

@@ -164,12 +164,10 @@ impl<'a> Packet<'a> {
                 self.1.extend(bytes);
             }
         } else {
-            use std::mem;
-
             assert!(self.1.is_empty());
             let mut v = self.0.to_vec();
             v.extend(bytes);
-            mem::replace(&mut self.1, v);
+            self.1 = v;
             self.0 = &[];
         }
     }