Upgrade smallvec to 1.0

jaynus · Nov 18, 2019 · aa8f43b · aa8f43b
1 parent 64da375
commit aa8f43b
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 24 deletions.
diff --git a/command/Cargo.toml b/command/Cargo.toml
@@ -16,6 +16,6 @@ profiler = ["thread_profiler/thread_profiler"]
 
 [dependencies]
 relevant = { version = "0.4.0", features = ["log", "backtrace"] }
-smallvec = "0.6"
+smallvec = "1.0"
 rendy-core = { version = "0.5.1", path = "../core" }
 thread_profiler = "0.3"
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -26,9 +26,9 @@ vulkan = ["gfx-backend-vulkan"]
 no-slow-safety-checks = []
 
 [dependencies]
-gfx-hal = { version = "0.4.1" }
-gfx-backend-empty = { version = "0.4", optional = true }
-gfx-backend-gl = { version = "0.4", features = ["glutin"], optional = true }
+gfx-hal = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4" }
+gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4", optional = true }
+gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4", features = ["glutin"], optional = true }
 lazy_static = "1.0"
 log = "0.4"
 parking_lot = "0.9"
@@ -37,10 +37,10 @@ thread_profiler = "0.3"
 raw-window-handle = "0.3"
 
 [target.'cfg(all(target_os = "windows", not(target_arch = "wasm32")))'.dependencies]
-gfx-backend-dx12 = { version = "0.4", optional = true }
+gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4", optional = true }
 
 [target.'cfg(any(all(not(target_arch = "wasm32"), target_os = "macos"), all(target_arch = "aarch64", target_os = "ios")))'.dependencies]
-gfx-backend-metal = { version = "0.4", optional = true }
+gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4", optional = true }
 
 [target.'cfg(all(any(target_os = "windows", all(unix, not(any(target_os = "macos", target_os = "ios")))), not(target_arch = "wasm32")))'.dependencies]
-gfx-backend-vulkan = { version = "0.4", features = ["x11"], optional = true }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4", features = ["x11"], optional = true }
diff --git a/descriptor/Cargo.toml b/descriptor/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["rendering"]
 description = "Rendy's descriptor allocator"
 
 [dependencies]
-gfx-hal = { version = "0.4" }
+gfx-hal = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4" }
 log = "0.4"
 relevant = { version = "0.4", features = ["log"] }
-smallvec = "0.6"
+smallvec = "1.0"
diff --git a/descriptor/src/allocator.rs b/descriptor/src/allocator.rs
@@ -308,7 +308,7 @@ where
                 extend.extend(
                     Iterator::zip(
                         self.allocation.pools.drain(..),
-                        self.allocation.sets.drain(),
+                        self.allocation.sets.drain(..),
                     )
                     .map(|(pool, set)| DescriptorSet {
                         raw: set,
@@ -327,16 +327,15 @@ where
                             // same pool, continue
                         }
                         Some(last) => {
-                            let sets = &mut self.allocation.sets;
                             // Free contiguous range of sets from one pool in one go.
-                            bucket.free((index + 1..sets.len()).map(|_| sets.pop().unwrap()), last);
+                            bucket.free(self.allocation.sets.drain(index + 1..), last);
                         }
                         None => last = Some(pool),
                     }
                 }
 
                 if let Some(last) = last {
-                    bucket.free(self.allocation.sets.drain(), last);
+                    bucket.free(self.allocation.sets.drain(0..), last);
                 }
 
                 Err(err)
@@ -370,7 +369,7 @@ where
                         .expect("Set should be allocated from this allocator");
                     debug_assert!(bucket.total >= raw_sets.len() as u64);
 
-                    bucket.free(raw_sets.drain(), *pool);
+                    bucket.free(raw_sets.drain(..), *pool);
                     *pool = set.pool;
                     *ranges = set.ranges;
                     raw_sets.push(set.raw);

diff --git a/factory/Cargo.toml b/factory/Cargo.toml
@@ -37,5 +37,5 @@ log = "0.4"
 parking_lot = "0.9"
 relevant = { version = "0.4", features = ["log"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
-smallvec = "0.6"
+smallvec = "1.0"
 thread_profiler = "0.3"
diff --git a/frame/Cargo.toml b/frame/Cargo.toml
@@ -24,5 +24,5 @@ rendy-core = { version = "0.5.1", path = "../core" }
 either = "1.5"
 log = "0.4"
 relevant = { version = "0.4", features = ["log"] }
-smallvec = "0.6"
+smallvec = "1.0"
 thread_profiler = "0.3"
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
@@ -36,5 +36,5 @@ bitflags = "1.0"
 log = "0.4"
 relevant = { version = "0.4", features = ["log"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
-smallvec = "0.6"
+smallvec = "1.0"
 thread_profiler = "0.3"
diff --git a/init/Cargo.toml b/init/Cargo.toml
@@ -25,4 +25,4 @@ rendy-core = { version = "0.5.1", path = "../core" }
 rendy-wsi = { version = "0.5.1", path = "../wsi" }
 winit = { version = "0.20.0-alpha4", optional = true, features = ["web-sys"] }
 log = "0.4"
-smallvec = "0.6"
+smallvec = "1.0"
diff --git a/memory/Cargo.toml b/memory/Cargo.toml
@@ -14,12 +14,12 @@ description = "Rendy's memory manager"
 serde-1 = ["serde", "gfx-hal/serde"]
 
 [dependencies]
-gfx-hal = { version = "0.4.1" }
+gfx-hal = { git = "https://github.com/gfx-rs/gfx", rev = "3641183231f16877d4ea2fbdb2ff208ce736d6c4" }
 log = "0.4"
 hibitset = {version = "0.6", default-features = false}
 relevant = { version = "0.4", features = ["log"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
-smallvec = "0.6"
+smallvec = "1.0"
 slab = "0.4"
 colorful = "0.2"
 

diff --git a/mesh/Cargo.toml b/mesh/Cargo.toml
@@ -25,7 +25,7 @@ rendy-core = { version = "0.5.1", path = "../core" }
 
 serde = { version = "1.0", optional = true, features = ["derive"] }
 wavefront_obj = { version = "6.0", optional = true }
-smallvec = { version = "0.6" }
+smallvec = "1.0"
 serde_bytes = { version = "0.11", optional = true }
 
 log = "0.4.6"
diff --git a/resource/Cargo.toml b/resource/Cargo.toml
@@ -20,4 +20,4 @@ relevant = { version = "0.4", features = ["log"] }
 rendy-descriptor = { version = "0.5.1", path = "../descriptor" }
 rendy-memory = { version = "0.5.2", path = "../memory" }
 rendy-core = { version = "0.5.1", path = "../core" }
-smallvec = "0.6"
+smallvec = "1.0"
diff --git a/shader/Cargo.toml b/shader/Cargo.toml
@@ -16,7 +16,7 @@ spirv-reflection = [ "spirv-reflect" ]
 serde-1 = ["serde", "rendy-core/serde-1"]
 
 [dependencies]
-smallvec = "0.6"
+smallvec = "1.0"
 log = "0.4"
 rendy-factory = { version = "0.5.1", path = "../factory" }
 rendy-core = { version = "0.5.1", path = "../core" }

diff --git a/wsi/Cargo.toml b/wsi/Cargo.toml
@@ -25,4 +25,4 @@ rendy-core = { version = "0.5.1", path = "../core" }
 
 log = "0.4"
 relevant = { version = "0.4", features = ["log"] }
-smallvec = "0.6"
+smallvec = "1.0"