Skip to content

Commit 1063d96

Browse files
committed
More version updates
1 parent cbb065e commit 1063d96

File tree

7 files changed

+22
-19
lines changed

7 files changed

+22
-19
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ members = [
77
"butane_cli",
88
"example",
99
"examples/getting_started",
10-
]
10+
]
11+
12+
[workspace.dependencies]
13+
rusqlite = "0.28"
14+
uuid = "1.2"

butane/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ proc-macro2="1.0"
4242
once_cell="1.5.2"
4343
postgres = { version = "0.19", features=["with-geo-types-0_7"] }
4444
r2d2_for_test = {package="r2d2", version = "0.8"}
45-
rusqlite = "0.25"
45+
rusqlite = {workspace=true}
4646
serde_json = "1.0"
47-
uuid_for_test = {package="uuid", version = "0.8", features=["v4"] }
47+
uuid_for_test = {package="uuid", version = "1.2", features=["v4"] }
4848

4949
[package.metadata.docs.rs]
5050
all-features = true

butane/tests/common/pg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pub fn pg_setup() -> PgSetupData {
128128
format!("host={} user=postgres", host)
129129
}
130130
};
131-
let new_dbname = format!("butane_test_{}", Uuid::new_v4().to_simple());
131+
let new_dbname = format!("butane_test_{}", Uuid::new_v4().simple());
132132
eprintln!("new db is `{}`", &new_dbname);
133133

134134
let mut conn = butane::db::connect(&ConnectionSpec::new("pg", &connstr)).unwrap();

butane_codegen/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ proc-macro2 = "1.0"
1616
butane_core = { path = "../butane_core", version = "0.5" }
1717
quote = "1.0"
1818
syn = { version = "1.0", features = ["full", "extra-traits"] }
19-
uuid = {version = "0.8", optional=true}
19+
uuid = {workspace=true, optional=true}
2020

2121
[lib]
2222
proc-macro = true

butane_core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ pin-project = "1"
3535
quote = "1.0"
3636
regex = "1.5"
3737
r2d2 = {version="0.8", optional=true}
38-
rusqlite = {version = "0.25", optional = true}
38+
rusqlite = {workspace=true, optional = true}
3939
serde = { version = "1.0", features=["derive"] }
4040
serde_json = "1.0"
4141
syn = { version = "1.0", features = ["full", "extra-traits"] }
4242
thiserror = "1.0"
4343
chrono = { version = "0.4", features=["serde"], optional = true }
44-
uuid = {version = "0.8", optional=true}
44+
uuid = {workspace=true, optional=true}

butane_core/src/db/sqlite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl BackendRow for rusqlite::Row<'_> {
391391
sql_valref_from_rusqlite(self.get_ref(idx)?, &ty)
392392
}
393393
fn len(&self) -> usize {
394-
self.column_count()
394+
self.as_ref().column_count()
395395
}
396396
}
397397

0 commit comments

Comments
 (0)