Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
language: rust
rust: stable

matrix:
include:
# MSRV
- env: TARGET=x86_64-unknown-linux-gnu
rust: nightly
rust: 1.31.0
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)

- env: TARGET=x86_64-unknown-linux-gnu
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)

# no-std sanity check
- env: TARGET=thumbv7m-none-eabi
rust: nightly
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)

# no-std sanity check
- env: TARGET=rustfmt
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)

before_install: set -e

Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Change Log

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [v0.1.0] - 2019-02-06

### Changed

- [breaking-change] The `heapless` dependency has been bumped to v0.4.0

- This crate now compiles on stable

## v0.0.1

Initial release

[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.5.8...HEAD
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[package]
authors = ["Jorge Aparicio <jorge@japaric.io>"]
edition = "2018"
name = "serde-json-core"
version = "0.1.0"

Expand Down
4 changes: 3 additions & 1 deletion ci/install.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
set -euxo pipefail

main() {
if [ $TARGET = thumbv7m-none-eabi ]; then
if [ $TARGET != rustfmt ]; then
rustup target add $TARGET
else
rustup component add rustfmt
fi
}

Expand Down
18 changes: 16 additions & 2 deletions ci/script.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
set -euxo pipefail

main() {
if [ $TARGET = rustfmt ]; then
cargo fmt -- --check
return
fi

cargo check --target $TARGET

if [ $TARGET = x86_64-unknown-linux-gnu ]; then
cargo test --target $TARGET
cargo check --target $TARGET --features std

return
fi
}

if [ $TRAVIS_BRANCH != master ]; then
# fake Travis variables to be able to run this on a local machine
if [ -z ${TRAVIS_BRANCH-} ]; then
TRAVIS_BRANCH=auto
fi

if [ -z ${TARGET-} ]; then
TARGET=$(rustc -Vv | grep host | cut -d ' ' -f2)
fi

if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then
main
fi
3 changes: 2 additions & 1 deletion src/de/enum_.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use serde::de;
use de::{Deserializer, Error, Result};

use crate::de::{Deserializer, Error, Result};

pub(crate) struct UnitVariantAccess<'a, 'b>
where
Expand Down
5 changes: 3 additions & 2 deletions src/de/map.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use serde::de::{self, Visitor};

use de::{Deserializer, Error};
use crate::de::{Deserializer, Error};

pub struct MapAccess<'a, 'b>
where
Expand All @@ -23,7 +23,8 @@ impl<'a, 'de> de::MapAccess<'de> for MapAccess<'a, 'de> {
where
K: de::DeserializeSeed<'de>,
{
let peek = match self.de
let peek = match self
.de
.parse_whitespace()
.ok_or(Error::EofWhileParsingObject)?
{
Expand Down
Loading