Commit 87f7c3ac authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'master' into 'master'

Changed the gitlab CI to match the travis CI

See merge request !20
parents defbbe20 a9207042
Pipeline #2142 failed with stage
in 1 minute and 6 seconds
...@@ -3,8 +3,10 @@ before_script: ...@@ -3,8 +3,10 @@ before_script:
- apt-get install -qq build-essential curl git - apt-get install -qq build-essential curl git
- curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
- source "$HOME/.cargo/env" - source "$HOME/.cargo/env"
- rustup component add rustfmt-preview
nightly: nightly:
script: script:
- cargo fmt -- --check
- cargo build - cargo build
- cargo test - cargo test
\ No newline at end of file
...@@ -278,9 +278,7 @@ pub struct DefaultEnvironment { ...@@ -278,9 +278,7 @@ pub struct DefaultEnvironment {
impl DefaultEnvironment { impl DefaultEnvironment {
pub fn new() -> DefaultEnvironment { pub fn new() -> DefaultEnvironment {
DefaultEnvironment { DefaultEnvironment { recursion_level: 0 }
recursion_level: 0
}
} }
} }
......
...@@ -423,7 +423,7 @@ mod tests { ...@@ -423,7 +423,7 @@ mod tests {
( (
((Value::hex(24) * Value::dec(4)).unwrap() ((Value::hex(24) * Value::dec(4)).unwrap()
* Value::Float(d128!(1) / d128!(48))) * Value::Float(d128!(1) / d128!(48)))
.unwrap(), .unwrap(),
Value::Float(d128!(2)), Value::Float(d128!(2)),
), ),
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment