From 23dd5d7c24dd80de2902c569a8f73efa6ae30e94 Mon Sep 17 00:00:00 2001 From: philippeitis <33013301+philippeitis@users.noreply.github.com> Date: Fri, 7 Oct 2022 21:46:03 -0700 Subject: [PATCH] chrono example types --- src/generator/lib/util.py | 10 +++++----- src/generator/templates/api/lib.rs.mako | 2 +- src/generator/templates/api/lib/lib.mako | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/generator/lib/util.py b/src/generator/lib/util.py index 604bd9f046..0827bf1bf0 100644 --- a/src/generator/lib/util.py +++ b/src/generator/lib/util.py @@ -65,7 +65,7 @@ words = [w.strip(',') for w in def chrono_date(): - return f"{CHRONO_DATE}::from_ymd({randint(1, 9999)}, {randint(1, 12)}, {randint(1, 31)})" + return f"chrono::NaiveDate::from_ymd({randint(1, 9999)}, {randint(1, 12)}, {randint(1, 31)})" RUST_TYPE_RND_MAP = { @@ -82,12 +82,12 @@ RUST_TYPE_RND_MAP = { "Vec": lambda: f"vec![0, 1, 2, 3]", "&Vec": lambda: f"&vec![0, 1, 2, 3]", # TODO: styling this - f"{CHRONO_PATH}::Duration": lambda: f"{CHRONO_PATH}::Duration::seconds({randint(0, 9999999)})", + f"{CHRONO_PATH}::Duration": lambda: f"chrono::Duration::seconds({randint(0, 9999999)})", CHRONO_DATE: chrono_date, - CHRONO_DATETIME: lambda: f"{CHRONO_PATH}::Utc::now()", - f"&{CHRONO_PATH}::Duration": lambda: f"&{CHRONO_PATH}::Duration::seconds({randint(0, 9999999)})", + CHRONO_DATETIME: lambda: f"chrono::Utc::now()", + f"&{CHRONO_PATH}::Duration": lambda: f"&chrono::Duration::seconds({randint(0, 9999999)})", f"&{CHRONO_DATE}": lambda: f"&{chrono_date()}", - f"&{CHRONO_DATETIME}": lambda: f"&{CHRONO_PATH}::Utc::now()", + f"&{CHRONO_DATETIME}": lambda: f"&chrono::Utc::now()", # why a reference to Vec? Because it works. Should be slice, but who knows how typing works here. } TREF = '$ref' diff --git a/src/generator/templates/api/lib.rs.mako b/src/generator/templates/api/lib.rs.mako index 1bf1ef0faa..a3adabaa6c 100644 --- a/src/generator/templates/api/lib.rs.mako +++ b/src/generator/templates/api/lib.rs.mako @@ -44,7 +44,7 @@ ${lib.docs(c)} pub use hyper; pub use hyper_rustls; pub extern crate google_apis_common as client; - +pub use client::chrono; pub mod api; // Re-export the hub type and some basic client structs diff --git a/src/generator/templates/api/lib/lib.mako b/src/generator/templates/api/lib/lib.mako index 1faed8fcd4..3d5ccd98cd 100644 --- a/src/generator/templates/api/lib/lib.mako +++ b/src/generator/templates/api/lib/lib.mako @@ -243,7 +243,7 @@ Arguments will always be copied or cloned into the builder, to make them indepen ############################################################################################### <%def name="test_hub(hub_type, comments=True)">\ use std::default::Default; -use ${util.library_name()}::{${hub_type}, oauth2, hyper, hyper_rustls}; +use ${util.library_name()}::{${hub_type}, oauth2, hyper, hyper_rustls, chrono}; % if comments: // Get an ApplicationSecret instance by some means. It contains the `client_id` and