Unverified Commit 5d69e730 authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Upgrade `cargo-api-linter` to the latest nightly Rust (#1579) 

* Upgrade `cargo-api-linter` to the latest Rust nightly
* Upgrade Rust nightly used by CI
* Handle failure to provide error context better
* Fix `aws-config` external type approval list
* Fix error context pathing issue
parent 458eeb63

aws/rust-runtime/aws-config/api-linter.toml

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ allowed_external_types = [ 
   "aws_smithy_http::body::SdkBody",

   "aws_smithy_http::result::SdkError",

   "aws_smithy_types::retry::RetryConfig*",

   "aws_smithy_types::timeout",

   "aws_smithy_types::timeout::config::Config",

   "aws_smithy_types::timeout::error::ConfigError",

   "aws_types::*",

tools/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ RUN set -eux; \ 
#

FROM bare_base_image AS install_rust

ARG rust_stable_version=1.58.1

ARG rust_nightly_version=nightly-2022-03-29

ARG rust_nightly_version=nightly-2022-07-25

ARG cargo_udeps_version=0.1.29

ARG cargo_hack_version=0.5.14

ARG cargo_minimal_versions_version=0.1.4
@@ -115,7 +115,7 @@ RUN set -eux; \ 
#

FROM bare_base_image AS final_image

ARG rust_stable_version=1.58.1

ARG rust_nightly_version=nightly-2022-03-29

ARG rust_nightly_version=nightly-2022-07-25

RUN set -eux; \

    yum -y updateinfo; \

    yum -y install \

tools/api-linter/Cargo.lock

+80 −59
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ dependencies = [ 


[[package]]

name = "anyhow"

version = "1.0.57"

version = "1.0.59"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"

checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9"



[[package]]

name = "async-trait"

version = "0.1.56"

version = "0.1.57"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"

checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"

dependencies = [

 "proc-macro2",

 "quote",
@@ -74,9 +74,9 @@ checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" 


[[package]]

name = "bytes"

version = "1.2.0"

version = "1.2.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e"

checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"



[[package]]

name = "camino"
@@ -175,9 +175,9 @@ dependencies = [ 


[[package]]

name = "clap_lex"

version = "0.2.2"

version = "0.2.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"

checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"

dependencies = [

 "os_str_bytes",

]
@@ -200,9 +200,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" 


[[package]]

name = "ctor"

version = "0.1.22"

version = "0.1.23"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"

checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"

dependencies = [

 "quote",

 "syn",
@@ -210,9 +210,9 @@ dependencies = [ 


[[package]]

name = "diff"

version = "0.1.12"

version = "0.1.13"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"

checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"



[[package]]

name = "encoding_rs"
@@ -323,9 +323,9 @@ dependencies = [ 


[[package]]

name = "hashbrown"

version = "0.11.2"

version = "0.12.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"

checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"



[[package]]

name = "heck"
@@ -426,9 +426,9 @@ dependencies = [ 


[[package]]

name = "indexmap"

version = "1.8.2"

version = "1.9.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"

checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"

dependencies = [

 "autocfg",

 "hashbrown",
@@ -457,9 +457,9 @@ checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" 


[[package]]

name = "itoa"

version = "1.0.2"

version = "1.0.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"

checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"



[[package]]

name = "js-sys"
@@ -550,9 +550,9 @@ dependencies = [ 


[[package]]

name = "once_cell"

version = "1.12.0"

version = "1.13.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"

checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"



[[package]]

name = "openssl"
@@ -601,9 +601,9 @@ dependencies = [ 


[[package]]

name = "os_str_bytes"

version = "6.1.0"

version = "6.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"

checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"



[[package]]

name = "output_vt100"
@@ -631,10 +631,11 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" 


[[package]]

name = "pest"

version = "2.1.3"

version = "2.2.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"

checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8"

dependencies = [

 "thiserror",

 "ucd-trie",

]
@@ -694,18 +695,18 @@ dependencies = [ 


[[package]]

name = "proc-macro2"

version = "1.0.39"

version = "1.0.43"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"

checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"

dependencies = [

 "unicode-ident",

]



[[package]]

name = "quote"

version = "1.0.18"

version = "1.0.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"

checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"

dependencies = [

 "proc-macro2",

]
@@ -793,18 +794,18 @@ dependencies = [ 


[[package]]

name = "rustdoc-types"

version = "0.10.0"

version = "0.12.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5cd93f56979d38715bf1012600fd3253525d4069b37282425e32a789a3b55748"

checksum = "b3a260c376ebec8b6fcd30f518b253772873c5dd8564b45e384aad8a79c62aa6"

dependencies = [

 "serde",

]



[[package]]

name = "ryu"

version = "1.0.10"

version = "1.0.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"

checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"



[[package]]

name = "schannel"
@@ -841,27 +842,27 @@ dependencies = [ 


[[package]]

name = "semver"

version = "1.0.10"

version = "1.0.13"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c"

checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"

dependencies = [

 "serde",

]



[[package]]

name = "serde"

version = "1.0.137"

version = "1.0.142"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"

checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"

version = "1.0.137"

version = "1.0.142"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"

checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e"

dependencies = [

 "proc-macro2",

 "quote",
@@ -870,9 +871,9 @@ dependencies = [ 


[[package]]

name = "serde_json"

version = "1.0.81"

version = "1.0.83"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"

checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"

dependencies = [

 "itoa",

 "ryu",
@@ -911,9 +912,9 @@ dependencies = [ 


[[package]]

name = "smallvec"

version = "1.8.0"

version = "1.9.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"

checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"



[[package]]

name = "smithy-rs-tool-common"
@@ -959,9 +960,9 @@ dependencies = [ 


[[package]]

name = "syn"

version = "1.0.96"

version = "1.0.99"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"

checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"

dependencies = [

 "proc-macro2",

 "quote",
@@ -1003,6 +1004,26 @@ version = "0.15.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"



[[package]]

name = "thiserror"

version = "1.0.32"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"

dependencies = [

 "thiserror-impl",

]



[[package]]

name = "thiserror-impl"

version = "1.0.32"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"

dependencies = [

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "thread_local"

version = "1.1.4"
@@ -1086,9 +1107,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" 


[[package]]

name = "tracing"

version = "0.1.35"

version = "0.1.36"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"

checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"

dependencies = [

 "cfg-if",

 "pin-project-lite",
@@ -1098,9 +1119,9 @@ dependencies = [ 


[[package]]

name = "tracing-attributes"

version = "0.1.21"

version = "0.1.22"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"

checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"

dependencies = [

 "proc-macro2",

 "quote",
@@ -1109,9 +1130,9 @@ dependencies = [ 


[[package]]

name = "tracing-core"

version = "0.1.27"

version = "0.1.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921"

checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"

dependencies = [

 "once_cell",

 "valuable",
@@ -1130,13 +1151,13 @@ dependencies = [ 


[[package]]

name = "tracing-subscriber"

version = "0.3.11"

version = "0.3.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"

checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"

dependencies = [

 "ansi_term",

 "lazy_static",

 "matchers",

 "once_cell",

 "regex",

 "sharded-slab",

 "smallvec",
@@ -1154,9 +1175,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" 


[[package]]

name = "ucd-trie"

version = "0.1.3"

version = "0.1.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"

checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c"



[[package]]

name = "unicode-bidi"
@@ -1166,9 +1187,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" 


[[package]]

name = "unicode-ident"

version = "1.0.0"

version = "1.0.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"

checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"



[[package]]

name = "unicode-normalization"
@@ -1303,9 +1324,9 @@ dependencies = [ 


[[package]]

name = "wildmatch"

version = "2.1.0"

version = "2.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0"

checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86"



[[package]]

name = "winapi"

tools/api-linter/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ cargo_metadata = "0.14" 
clap = { version = "~3.1.18", features = ["derive"] }

owo-colors = { version = "3", features = ["supports-colors"] }

pest = "2" # For pretty error formatting

rustdoc-types = "0.10"

rustdoc-types = "0.12"

serde = { version = "1", features = ["derive"] }

serde_json = "1"

smithy-rs-tool-common = { version = "0.1", path = "../smithy-rs-tool-common" }

tools/api-linter/src/error.rs

+39 −22
Original line number Diff line number Diff line
@@ -195,21 +195,21 @@ impl fmt::Display for ValidationError { 
///

/// This makes validation errors look similar to the compiler errors from rustc.

pub struct ErrorPrinter {

    crate_path: PathBuf,

    workspace_root: PathBuf,

    file_cache: HashMap<PathBuf, String>,

}



impl ErrorPrinter {

    pub fn new(crate_path: impl Into<PathBuf>) -> Self {

    pub fn new(workspace_root: impl Into<PathBuf>) -> Self {

        Self {

            crate_path: crate_path.into(),

            workspace_root: workspace_root.into(),

            file_cache: HashMap::new(),

        }

    }



    fn get_file_contents(&mut self, path: &Path) -> Result<&str> {

        if !self.file_cache.contains_key(path) {

            let full_file_name = self.crate_path.join("..").join(path).canonicalize()?;

            let full_file_name = self.workspace_root.join(path).canonicalize()?;

            let contents = std::fs::read_to_string(&full_file_name)

                .context("failed to load source file for error context")

                .context(full_file_name.to_string_lossy().to_string())?;
@@ -218,8 +218,9 @@ impl ErrorPrinter { 
        Ok(self.file_cache.get(path).unwrap())

    }



    pub fn pretty_print_error_context(&mut self, location: &Span, subtext: String) -> Result<()> {

        let file_contents = self.get_file_contents(&location.filename)?;

    pub fn pretty_print_error_context(&mut self, location: &Span, subtext: String) {

        match self.get_file_contents(&location.filename) {

            Ok(file_contents) => {

                let begin = Self::position_from_line_col(file_contents, location.begin);

                let end = Self::position_from_line_col(file_contents, location.end);
@@ -227,7 +228,9 @@ impl ErrorPrinter { 
                // knowledge of a smaller library tailored to this use-case

                let variant = pest::error::ErrorVariant::<()>::CustomError { message: subtext };

                let err_context = match (begin, end) {

            (Some(b), Some(e)) => Some(pest::error::Error::new_from_span(variant, b.span(&e))),

                    (Some(b), Some(e)) => {

                        Some(pest::error::Error::new_from_span(variant, b.span(&e)))

                    }

                    (Some(b), None) => Some(pest::error::Error::new_from_pos(variant, b)),

                    _ => None,

                };
@@ -237,7 +240,21 @@ impl ErrorPrinter { 
                        err_context.with_path(&location.filename.to_string_lossy())

                    );

                }

        Ok(())

            }

            Err(err) => {

                println!("error: {subtext}");

                println!(

                    "  --> {}:{}:{}",

                    location.filename.to_string_lossy(),

                    location.begin.0,

                    location.begin.1 + 1

                );

                println!("   | Failed to load {:?}", location.filename);

                println!("   | relative to {:?}", self.workspace_root);

                println!("   | to provide error message context.");

                println!("   | Cause: {err:?}");

            }

        }

    }



    fn position_from_line_col(contents: &str, (line, col): (usize, usize)) -> Option<Position> {