Update dependencies to bring in line with mozilla-central

.circleci/config.yml

@@ -353,7 +353,7 @@ jobs:
  resource_class: "medium+"
  steps:
  - test-rust:
- rust-version: "1.62.0"
+ rust-version: "1.63.0"
 
  Generate Rust documentation:
  docker:

.github/workflows/cargo-vet.yml

@@ -9,7 +9,7 @@ jobs:
  name: Vet Dependencies
  runs-on: ubuntu-latest
  env:
- CARGO_VET_VERSION: 0.6.1
+ CARGO_VET_VERSION: 0.8.0
  steps:
  - uses: actions/checkout@master
  - name: Install Rust

README.md

@@ -27,7 +27,7 @@ The code in this repository is organized as follows:
 * [./glean-core/ios](glean-core/ios) contains the Swift bindings for use by iOS applications.
 * [./glean-core/python](glean-core/python) contains Python bindings.
 
-**Note: The Glean SDK requires at least [Rust 1.62.0](https://blog.rust-lang.org/2022/06/30/Rust-1.62.0.html). Older versions are untested.**
+**Note: The Glean SDK requires at least [Rust 1.63.0](https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html). Older versions are untested.**
 
 ## Contact
 

deny.toml

@@ -20,19 +20,15 @@ skip = [
  # wasi 0.10 and 0.11 are allowed
  # (m-c patches 0.10 to 0.11)
  { name = "wasi", version = "0.11.0" },
+ # bitflags 1.3.2 is a dependency of lmdb-rkv,
+ # with bitflags in use by others.
+ # This is overriden in m-c
+ { name = "bitflags", version = "1.3.2" },
 ]
 
 # Avoid certain crates
 deny = [
- # 0.42 allowed as part of env_logger, which is now optionally included
- # and only used in Android dev builds
- # done in order to stay compatible with mozilla-central
- # see https://searchfox.org/mozilla-central/rev/47aea2f603cc18144afcedbd604a418f11e90f9b/python/mozbuild/mozbuild/vendor/vendor_rust.py#78-92
- { name = "windows-sys", version = "> 0.42" },
- { name = "windows_aarch64_msvc", version = "> 0.42" },
- { name = "windows_i686_gnu", version = "> 0.42" },
- { name = "windows_i686_msvc", version = "> 0.42" },
- { name = "windows_x86_64_gnu", version = "> 0.42" },
- { name = "windows_x86_64_msvc", version = "> 0.42" },
+ # We can allow the windows-sys and windows_$arch crates,
+ # now that m-c allows them (and potentially overrides some uses)
  { name = "windows", version = "*" },
 ]

glean-core/Cargo.toml

@@ -18,7 +18,7 @@ include = [
  "/uniffi.toml",
  "/build.rs",
 ]
-rust-version = "1.62"
+rust-version = "1.63"
 
 [package.metadata.glean]
 glean-parser = "10.0.0"
@@ -51,8 +51,8 @@ android_logger = { version = "0.12.0", default-features = false }
 oslog = { version = "0.1.0", default-features = false, features = ["logger"] }
 
 [dev-dependencies]
-env_logger = { version = "0.10.0", default-features = false, features = ["auto-color", "humantime"] }
-tempfile = "3.1.0"
+env_logger = { version = "0.10.0", default-features = false, features = ["humantime"] }
+tempfile = "3.8.0"
 iso8601 = "0.4"
 ctor = "0.2.2"
 

glean-core/build/Cargo.toml

@@ -13,7 +13,7 @@ include = [
  "/src",
  "/Cargo.toml",
 ]
-rust-version = "1.62"
+rust-version = "1.63"
 
 [dependencies]
 xshell-venv = "1.1.0"

glean-core/rlb/Cargo.toml

@@ -15,7 +15,7 @@ include = [
  "/tests",
  "/Cargo.toml",
 ]
-rust-version = "1.62"
+rust-version = "1.63"
 
 [badges]
 circle-ci = { repository = "mozilla/glean", branch = "main" }
@@ -39,7 +39,7 @@ time = "0.1.40"
 whatsys = "0.3.0"
 
 [dev-dependencies]
-env_logger = { version = "0.10.0", default-features = false, features = ["auto-color", "humantime"] }
+env_logger = { version = "0.10.0", default-features = false, features = ["humantime"] }
 tempfile = "3.1.0"
 jsonschema-valid = "0.5.0"
 flate2 = "1.0.19"

samples/rust/Cargo.toml

@@ -6,7 +6,7 @@ publish = false
 license = "MIT"
 
 [dependencies]
-env_logger = { version = "0.10.0", default-features = false, features = ["auto-color", "humantime"] }
+env_logger = { version = "0.10.0", default-features = false, features = ["humantime"] }
 glean = { path = "../../glean-core/rlb" }
 tempfile = "3.3.0"