---

yaml
---
r: 171311
b: refs/heads/batch
c: 5344ae2
h: refs/heads/master
i:
  171309: aa3eafc
  171307: 62c599d
  171303: 65ff148
  171295: 72d3dc5
v: v3

Author: ville-h

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 817f75d2fbc15dd152c9473e012ec5271cb5e94b
+refs/heads/batch: 5344ae2d4f66f5e8392b325320eeec0af29f503c
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/libstd/sync/rwlock.rs

@@ -101,7 +101,7 @@ unsafe impl Sync for StaticRwLock {}
 
 /// Constant initialization for a statically-initialized rwlock.
 #[unstable = "may be merged with RwLock in the future"]
-pub const RWLOCK_INIT: StaticRwLock = StaticRwLock {
+pub const RW_LOCK_INIT: StaticRwLock = StaticRwLock {
     lock: sys::RWLOCK_INIT,
     poison: poison::FLAG_INIT,
 };