Skip to content

Commit fe7f0b3

Browse files
iliekturtlesiliekturtles
authored
Merge pull request #285 from nick-pascucci-spire/dev-absement-2
fix: use singular unit names in si::absement
2 parents 1d81d49 + ddba9bd commit fe7f0b3

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎src/si/absement.rs

+48-48
Original file line numberDiff line numberDiff line change
@@ -13,52 +13,52 @@ quantity! {
1313
Z0, // amount of substance
1414
Z0>; // luminous intensity
1515
units {
16-
@yottameter_seconds: prefix!(yotta); "Ym · s", "yottameter second",
16+
@yottameter_second: prefix!(yotta); "Ym · s", "yottameter second",
1717
"yottameter seconds";
18-
@zettameter_seconds: prefix!(zetta); "Zm · s", "zettameter second",
18+
@zettameter_second: prefix!(zetta); "Zm · s", "zettameter second",
1919
"zettameter seconds";
20-
@exameter_seconds: prefix!(exa); "Em · s", "exameter second",
20+
@exameter_second: prefix!(exa); "Em · s", "exameter second",
2121
"exameter seconds";
22-
@petameter_seconds: prefix!(peta); "Pm · s", "petameter second",
22+
@petameter_second: prefix!(peta); "Pm · s", "petameter second",
2323
"petameter seconds";
24-
@terameter_seconds: prefix!(tera); "Tm · s", "terameter second",
24+
@terameter_second: prefix!(tera); "Tm · s", "terameter second",
2525
"terameter seconds";
26-
@gigameter_seconds: prefix!(giga); "Gm · s", "gigameter second",
26+
@gigameter_second: prefix!(giga); "Gm · s", "gigameter second",
2727
"gigameter seconds";
28-
@megameter_seconds: prefix!(mega); "Mm · s", "megameter second",
28+
@megameter_second: prefix!(mega); "Mm · s", "megameter second",
2929
"megameter seconds";
30-
@kilometer_seconds: prefix!(kilo); "km · s", "kilometer second",
30+
@kilometer_second: prefix!(kilo); "km · s", "kilometer second",
3131
"kilometer seconds";
32-
@hectometer_seconds: prefix!(hecto); "hm · s", "hectometer second",
32+
@hectometer_second: prefix!(hecto); "hm · s", "hectometer second",
3333
"hectometer seconds";
34-
@decameter_seconds: prefix!(deca); "dam · s", "decameter second",
34+
@decameter_second: prefix!(deca); "dam · s", "decameter second",
3535
"decameter seconds";
36-
@meter_seconds: prefix!(none); "m · s", "meter second",
36+
@meter_second: prefix!(none); "m · s", "meter second",
3737
"meter seconds";
38-
@decimeter_seconds: prefix!(deci); "dm · s", "decimeter second",
38+
@decimeter_second: prefix!(deci); "dm · s", "decimeter second",
3939
"decimeter seconds";
40-
@centimeter_seconds: prefix!(centi); "cm · s", "centimeter second",
40+
@centimeter_second: prefix!(centi); "cm · s", "centimeter second",
4141
"centimeter seconds";
42-
@millimeter_seconds: prefix!(milli); "mm · s", "millimeter second",
42+
@millimeter_second: prefix!(milli); "mm · s", "millimeter second",
4343
"millimeter seconds";
44-
@micrometer_seconds: prefix!(micro); "µm · s", "micrometer second",
44+
@micrometer_second: prefix!(micro); "µm · s", "micrometer second",
4545
"micrometer seconds";
46-
@nanometer_seconds: prefix!(nano); "nm · s", "nanometer second",
46+
@nanometer_second: prefix!(nano); "nm · s", "nanometer second",
4747
"nanometer seconds";
48-
@picometer_seconds: prefix!(pico); "pm · s", "picometer second",
48+
@picometer_second: prefix!(pico); "pm · s", "picometer second",
4949
"picometer seconds";
50-
@femtometer_seconds: prefix!(femto); "fm · s", "femtometer second",
50+
@femtometer_second: prefix!(femto); "fm · s", "femtometer second",
5151
"femtometer seconds";
52-
@attometer_seconds: prefix!(atto); "am · s", "attometer second",
52+
@attometer_second: prefix!(atto); "am · s", "attometer second",
5353
"attometer seconds";
54-
@zeptometer_seconds: prefix!(zepto); "zm · s", "zeptometer second",
54+
@zeptometer_second: prefix!(zepto); "zm · s", "zeptometer second",
5555
"zeptometer seconds";
56-
@yoctometer_seconds: prefix!(yocto); "ym · s", "yoctometer second",
56+
@yoctometer_second: prefix!(yocto); "ym · s", "yoctometer second",
5757
"yoctometer seconds";
5858

59-
@foot_seconds: 3.048_E-1; "ft · s", "foot second", "foot seconds";
60-
@inch_seconds: 2.54_E-2; "in · s", "inch second", "inch seconds";
61-
@kilometer_hours: 3.6_E6; "km · h", "kilometer hour", "kilometer hours";
59+
@foot_second: 3.048_E-1; "ft · s", "foot second", "foot seconds";
60+
@inch_second: 2.54_E-2; "in · s", "inch second", "inch seconds";
61+
@kilometer_hour: 3.6_E6; "km · h", "kilometer hour", "kilometer hours";
6262
}
6363
}
6464

@@ -80,31 +80,31 @@ mod tests {
8080

8181
#[test]
8282
fn check_units() {
83-
test::<l::yottameter, t::second, a::yottameter_seconds>();
84-
test::<l::zettameter, t::second, a::zettameter_seconds>();
85-
test::<l::exameter, t::second, a::exameter_seconds>();
86-
test::<l::petameter, t::second, a::petameter_seconds>();
87-
test::<l::terameter, t::second, a::terameter_seconds>();
88-
test::<l::gigameter, t::second, a::gigameter_seconds>();
89-
test::<l::megameter, t::second, a::megameter_seconds>();
90-
test::<l::kilometer, t::second, a::kilometer_seconds>();
91-
test::<l::hectometer, t::second, a::hectometer_seconds>();
92-
test::<l::decameter, t::second, a::decameter_seconds>();
93-
test::<l::meter, t::second, a::meter_seconds>();
94-
test::<l::decimeter, t::second, a::decimeter_seconds>();
95-
test::<l::centimeter, t::second, a::centimeter_seconds>();
96-
test::<l::millimeter, t::second, a::millimeter_seconds>();
97-
test::<l::micrometer, t::second, a::micrometer_seconds>();
98-
test::<l::nanometer, t::second, a::nanometer_seconds>();
99-
test::<l::picometer, t::second, a::picometer_seconds>();
100-
test::<l::femtometer, t::second, a::femtometer_seconds>();
101-
test::<l::attometer, t::second, a::attometer_seconds>();
102-
test::<l::zeptometer, t::second, a::zeptometer_seconds>();
103-
test::<l::yoctometer, t::second, a::yoctometer_seconds>();
83+
test::<l::yottameter, t::second, a::yottameter_second>();
84+
test::<l::zettameter, t::second, a::zettameter_second>();
85+
test::<l::exameter, t::second, a::exameter_second>();
86+
test::<l::petameter, t::second, a::petameter_second>();
87+
test::<l::terameter, t::second, a::terameter_second>();
88+
test::<l::gigameter, t::second, a::gigameter_second>();
89+
test::<l::megameter, t::second, a::megameter_second>();
90+
test::<l::kilometer, t::second, a::kilometer_second>();
91+
test::<l::hectometer, t::second, a::hectometer_second>();
92+
test::<l::decameter, t::second, a::decameter_second>();
93+
test::<l::meter, t::second, a::meter_second>();
94+
test::<l::decimeter, t::second, a::decimeter_second>();
95+
test::<l::centimeter, t::second, a::centimeter_second>();
96+
test::<l::millimeter, t::second, a::millimeter_second>();
97+
test::<l::micrometer, t::second, a::micrometer_second>();
98+
test::<l::nanometer, t::second, a::nanometer_second>();
99+
test::<l::picometer, t::second, a::picometer_second>();
100+
test::<l::femtometer, t::second, a::femtometer_second>();
101+
test::<l::attometer, t::second, a::attometer_second>();
102+
test::<l::zeptometer, t::second, a::zeptometer_second>();
103+
test::<l::yoctometer, t::second, a::yoctometer_second>();
104104

105-
test::<l::foot, t::second, a::foot_seconds>();
106-
test::<l::inch, t::second, a::inch_seconds>();
107-
test::<l::kilometer, t::hour, a::kilometer_hours>();
105+
test::<l::foot, t::second, a::foot_second>();
106+
test::<l::inch, t::second, a::inch_second>();
107+
test::<l::kilometer, t::hour, a::kilometer_hour>();
108108

109109
fn test<L: l::Conversion<V>, T: t::Conversion<V>, A: a::Conversion<V>>() {
110110
Test::assert_eq(&Absement::new::<A>(V::one()),

0 commit comments

Comments
 (0)