diff --git a/CHANGELOG.md b/CHANGELOG.md index e9f70680..d233b352 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ ### Fixed ### Security --> +## [v0.20.1] — 2018-09-13 +This release resolves nightly rustc error E0659 the base.rs example caused by +[rust-lang/rust](https://github.com/rust-lang/rust) pull request +[#52841](https://github.com/rust-lang/rust/pull/52841) "resolve: Implement prelude search for macro +paths, implement tool attributes." + ## [v0.20.0] — 2018-09-06 This release resolves long-standing issue [#3](https://github.com/iliekturtles/uom/issues/3) to implement thermodynamic temperature conversions (e.g. Celsius to Fahrenheit). Support is also added @@ -277,7 +283,8 @@ for the creation of custom systems or the use of the pre-built SI. Basic mathema are implemented and a minimal set of quantities (length, mass, time...) and units (meter, kilometer, foot, mile, ...) are included. -[Unreleased]: https://github.com/iliekturtles/uom/compare/v0.20.0...master +[Unreleased]: https://github.com/iliekturtles/uom/compare/v0.20.1...master +[v0.20.1]: https://github.com/iliekturtles/uom/compare/v0.20.0...v0.20.1 [v0.20.0]: https://github.com/iliekturtles/uom/compare/v0.19.0...v0.20.0 [v0.19.0]: https://github.com/iliekturtles/uom/compare/v0.18.0...v0.19.0 [v0.18.0]: https://github.com/iliekturtles/uom/compare/v0.17.0...v0.18.0 diff --git a/Cargo.toml b/Cargo.toml index 1d51d5d4..5b6468a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uom" -version = "0.20.0" +version = "0.20.1" authors = ["Mike Boutin "] description = "Units of measurement" documentation = "https://docs.rs/uom" diff --git a/README.md b/README.md index 78506296..56731783 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Units of measurement is a crate that does automatic type-safe zero-cost ```toml [dependencies] -uom = "0.20.0" +uom = "0.20.1" ``` and this to your crate root: @@ -73,7 +73,7 @@ enabled by default. Features can be cherry-picked by using the `--no-default-fea ```toml [dependencies] uom = { - version = "0.20.0", + version = "0.20.1", default-features = false, features = [ "autoconvert", # automatic base unit conversion. diff --git a/src/lib.rs b/src/lib.rs index fa086ab5..f7adc475 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,7 +18,7 @@ //! //! ```toml //! [dependencies] -//! uom = "0.20.0" +//! uom = "0.20.1" //! ``` //! //! and this to your crate root: @@ -61,7 +61,7 @@ //! ```toml //! [dependencies] //! uom = { -//! version = "0.20.0", +//! version = "0.20.1", //! default-features = false, //! features = [ //! "autoconvert", # automatic base unit conversion. diff --git a/src/system.rs b/src/system.rs index 47426a4e..e01827f0 100644 --- a/src/system.rs +++ b/src/system.rs @@ -1315,21 +1315,21 @@ macro_rules! system { #[macro_export] macro_rules! $quantities { ($path:path) => { - use $path as system; + use $path as __system; $(/// [`Quantity`](struct.Quantity.html) type alias using the default base units /// parameterized on the underlying storage type. #[allow(dead_code)] #[allow(unused_qualifications)] - pub type $quantity = system::$module::$quantity, V>;)+ + pub type $quantity = __system::$module::$quantity<__system::$units, V>;)+ }; ($path:path, $V:ty) => { - use $path as system; + use $path as __system; $(/// [`Quantity`](struct.Quantity.html) type alias using the default base units. #[allow(dead_code)] #[allow(unused_qualifications)] - pub type $quantity = system::$module::$quantity, $V>;)+ + pub type $quantity = __system::$module::$quantity<__system::$units<$V>, $V>;)+ }; ($path:path, $V:ty, $U:tt) => { system!(@quantities $path, $V; $($name),+; $U; $($module::$quantity),+); @@ -1343,14 +1343,14 @@ macro_rules! system { ($($U:ident),+); $($module:ident::$quantity:ident),+ ) => { - use $path as system; + use $path as __system; - type Units = system::Units<$V, $($name = system::$name::$U,)+>; + type Units = __system::Units<$V, $($name = __system::$name::$U,)+>; $(/// [`Quantity`](struct.Quantity.html) type alias using the given base units. #[allow(dead_code)] #[allow(unused_qualifications)] - pub type $quantity = system::$module::$quantity;)+ + pub type $quantity = __system::$module::$quantity;)+ }; (@replace $_t:tt $sub:ty) => { $sub }; }