From e513da1f3ab11fa9ba633af280687aed60c104d4 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 30 May 2018 14:27:16 -0700 Subject: [PATCH] Stop importing from msRest --- lib/restError.ts | 2 +- lib/serviceClient.ts | 4 ++-- test/shared/axiosHttpClientTests.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/restError.ts b/lib/restError.ts index 4cceb9e..842d137 100644 --- a/lib/restError.ts +++ b/lib/restError.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. import { WebResource } from "./webResource"; -import { HttpOperationResponse } from "./msRest"; +import { HttpOperationResponse } from "./httpOperationResponse"; export class RestError extends Error { code?: string; diff --git a/lib/serviceClient.ts b/lib/serviceClient.ts index a7e57de..aa5e5d0 100644 --- a/lib/serviceClient.ts +++ b/lib/serviceClient.ts @@ -17,12 +17,12 @@ import { rpRegistrationPolicy } from "./policies/rpRegistrationPolicy"; import { serializationPolicy } from "./policies/serializationPolicy"; import { signingPolicy } from "./policies/signingPolicy"; import { systemErrorRetryPolicy } from "./policies/systemErrorRetryPolicy"; +import { QueryCollectionFormat, getQueryCollectionFormatSeparator } from "./queryCollectionFormat"; import { Serializer } from "./serializer"; +import { URLBuilder } from "./url"; import { Constants } from "./util/constants"; import * as utils from "./util/utils"; import { RequestPrepareOptions, WebResource } from "./webResource"; -import { URLBuilder } from "./url"; -import { QueryCollectionFormat, getQueryCollectionFormatSeparator } from "./queryCollectionFormat"; /** * Options to be provided while creating the client. diff --git a/test/shared/axiosHttpClientTests.ts b/test/shared/axiosHttpClientTests.ts index 7e53375..6412360 100644 --- a/test/shared/axiosHttpClientTests.ts +++ b/test/shared/axiosHttpClientTests.ts @@ -3,9 +3,9 @@ import * as assert from "assert"; import * as should from "should"; import { AxiosHttpClient } from "../../lib/axiosHttpClient"; -import { baseURL } from "../testUtils"; +import { isNode } from "../../lib/util/utils"; import { WebResource } from "../../lib/webResource"; -import { isNode } from "../../lib/msRest"; +import { baseURL } from "../testUtils"; function getAbortController(): AbortController { let controller: AbortController;