Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
redox-os
calc
Commits
87f7c3ac
Commit
87f7c3ac
authored
Dec 08, 2018
by
Jeremy Soller
Browse files
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
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
87f7c3ac
...
...
@@ -3,8 +3,10 @@ before_script:
-
apt-get install -qq build-essential curl git
-
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
-
source "$HOME/.cargo/env"
-
rustup component add rustfmt-preview
nightly
:
script
:
-
cargo fmt -- --check
-
cargo build
-
cargo test
\ No newline at end of file
-
cargo test
src/parse.rs
View file @
87f7c3ac
...
...
@@ -278,9 +278,7 @@ pub struct DefaultEnvironment {
impl
DefaultEnvironment
{
pub
fn
new
()
->
DefaultEnvironment
{
DefaultEnvironment
{
recursion_level
:
0
}
DefaultEnvironment
{
recursion_level
:
0
}
}
}
...
...
src/value.rs
View file @
87f7c3ac
...
...
@@ -423,7 +423,7 @@ mod tests {
(
((
Value
::
hex
(
24
)
*
Value
::
dec
(
4
))
.unwrap
()
*
Value
::
Float
(
d128!
(
1
)
/
d128!
(
48
)))
.unwrap
(),
.unwrap
(),
Value
::
Float
(
d128!
(
2
)),
),
];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment