Skip to content

Commit 28f7002

Browse files
committed
Resolve build failure with recent nightly versions.
Resolves rustc error E0659 in the base.rs example caused by [rust-lang/rust](https://github.com/rust-lang/rust) pull request [#52841](rust-lang/rust#52841) "resolve: Implement prelude search for macro paths, implement tool attributes."
1 parent fef4129 commit 28f7002

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/system.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,21 +1315,21 @@ macro_rules! system {
13151315
#[macro_export]
13161316
macro_rules! $quantities {
13171317
($path:path) => {
1318-
use $path as system;
1318+
use $path as __system;
13191319

13201320
$(/// [`Quantity`](struct.Quantity.html) type alias using the default base units
13211321
/// parameterized on the underlying storage type.
13221322
#[allow(dead_code)]
13231323
#[allow(unused_qualifications)]
1324-
pub type $quantity<V> = system::$module::$quantity<system::$units<V>, V>;)+
1324+
pub type $quantity<V> = __system::$module::$quantity<__system::$units<V>, V>;)+
13251325
};
13261326
($path:path, $V:ty) => {
1327-
use $path as system;
1327+
use $path as __system;
13281328

13291329
$(/// [`Quantity`](struct.Quantity.html) type alias using the default base units.
13301330
#[allow(dead_code)]
13311331
#[allow(unused_qualifications)]
1332-
pub type $quantity = system::$module::$quantity<system::$units<$V>, $V>;)+
1332+
pub type $quantity = __system::$module::$quantity<__system::$units<$V>, $V>;)+
13331333
};
13341334
($path:path, $V:ty, $U:tt) => {
13351335
system!(@quantities $path, $V; $($name),+; $U; $($module::$quantity),+);
@@ -1343,14 +1343,14 @@ macro_rules! system {
13431343
($($U:ident),+);
13441344
$($module:ident::$quantity:ident),+
13451345
) => {
1346-
use $path as system;
1346+
use $path as __system;
13471347

1348-
type Units = system::Units<$V, $($name = system::$name::$U,)+>;
1348+
type Units = __system::Units<$V, $($name = __system::$name::$U,)+>;
13491349

13501350
$(/// [`Quantity`](struct.Quantity.html) type alias using the given base units.
13511351
#[allow(dead_code)]
13521352
#[allow(unused_qualifications)]
1353-
pub type $quantity = system::$module::$quantity<Units, $V>;)+
1353+
pub type $quantity = __system::$module::$quantity<Units, $V>;)+
13541354
};
13551355
(@replace $_t:tt $sub:ty) => { $sub };
13561356
}

0 commit comments

Comments
 (0)