浏览代码

Merge remote-tracking branch 'upstream/master' into optional-local-nmi

Pierre Krieger 5 年之前
父节点
当前提交
c34d252360
共有 2 个文件被更改,包括 1 次插入5 次删除
  1. 0 4
      .travis.yml
  2. 1 1
      acpi/src/lib.rs

+ 0 - 4
.travis.yml

@@ -23,11 +23,7 @@ branches:
 before_install:
   - sudo apt-get install -y acpica-tools
 
-before_script:
-  - rustup component add rustfmt-preview
-
 script:
-  - cargo fmt --all -- --check
   - cargo build --all
   - cargo test --all
   - cargo run --bin aml_tester -- -p tests

+ 1 - 1
acpi/src/lib.rs

@@ -22,7 +22,7 @@
 //! gathered from the static tables, and can be queried to set up hardware etc.
 
 #![no_std]
-#![feature(nll, exclusive_range_pattern, const_generics)]
+#![feature(const_generics)]
 
 extern crate alloc;
 #[cfg_attr(test, macro_use)]